You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2016/10/25 15:34:38 UTC
svn commit: r1766546 [2/7] - in /bval/trunk:
bval-core/src/main/java/org/apache/bval/
bval-core/src/main/java/org/apache/bval/model/
bval-core/src/main/java/org/apache/bval/util/
bval-core/src/main/java/org/apache/bval/util/reflection/ bval-core/src/te...
Modified: bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java (original)
+++ bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java Tue Oct 25 15:34:35 2016
@@ -22,7 +22,6 @@ import javax.validation.ConstraintValida
import javax.validation.ConstraintValidatorContext;
import java.io.File;
-
/**
* Description: <br/>
*/
Modified: bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java (original)
+++ bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java Tue Oct 25 15:34:35 2016
@@ -39,9 +39,9 @@ import static java.lang.annotation.Reten
* Description: annotation to validate a java.io.File is a symbolic link<br/>
*/
@Documented
-@Constraint( validatedBy = SymlinkValidator.class )
-@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } )
-@Retention( RUNTIME )
+@Constraint(validatedBy = SymlinkValidator.class)
+@Target({ FIELD, ANNOTATION_TYPE, PARAMETER })
+@Retention(RUNTIME)
public @interface Symlink {
Class<?>[] groups() default {};
Modified: bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java (original)
+++ bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java Tue Oct 25 15:34:35 2016
@@ -23,7 +23,6 @@ import javax.validation.ConstraintValida
import java.io.File;
import java.io.IOException;
-
/**
* Description: <br/>
*/
Modified: bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java (original)
+++ bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java Tue Oct 25 15:34:35 2016
@@ -39,9 +39,9 @@ import static java.lang.annotation.Reten
* Description: annotation to validate a java.io.File is a directory<br/>
*/
@Documented
-@Constraint( validatedBy = DomainValidator.class )
-@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } )
-@Retention( RUNTIME )
+@Constraint(validatedBy = DomainValidator.class)
+@Target({ FIELD, ANNOTATION_TYPE, PARAMETER })
+@Retention(RUNTIME)
public @interface Domain {
Class<?>[] groups() default {};
Modified: bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java (original)
+++ bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java Tue Oct 25 15:34:35 2016
@@ -70,9 +70,8 @@ public class DomainValidator implements
// Regular expression strings for hostnames (derived from RFC2396 and RFC 1123)
private static final Pattern DOMAIN_LABEL = Pattern.compile("\\p{Alnum}(?>[\\p{Alnum}-]*\\p{Alnum})*");
- private static final Pattern DOMAIN_NAME_REGEX = Pattern.compile("^(?:"
- + DOMAIN_LABEL.pattern()
- + "\\.)+(\\p{Alpha}{2,})$");
+ private static final Pattern DOMAIN_NAME_REGEX =
+ Pattern.compile("^(?:" + DOMAIN_LABEL.pattern() + "\\.)+(\\p{Alpha}{2,})$");
/**
* {@inheritDoc}
@@ -84,7 +83,7 @@ public class DomainValidator implements
domain = matcher.group(1);
return isValidTld(domain);
} else if (allowLocal && DOMAIN_LABEL.matcher(domain).matches()) {
- return true;
+ return true;
}
return false;
}
@@ -99,13 +98,11 @@ public class DomainValidator implements
*/
boolean isValidTld(String tld) {
if (allowLocal && isValidLocalTld(tld)) {
- return true;
+ return true;
}
tld = chompLeadingDot(tld).toLowerCase();
- return isValidInfrastructureTld(tld)
- || isValidGenericTld(tld)
- || isValidCountryCodeTld(tld);
+ return isValidInfrastructureTld(tld) || isValidGenericTld(tld) || isValidCountryCodeTld(tld);
}
/**
@@ -168,290 +165,286 @@ public class DomainValidator implements
// ----- Authoritative and comprehensive list at:
// ----- http://data.iana.org/TLD/tlds-alpha-by-domain.txt
- private static final List<String> INFRASTRUCTURE_TLDS = asList(
- "arpa", // internet infrastructure
- "root" // diagnostic marker for non-truncated root zone
+ private static final List<String> INFRASTRUCTURE_TLDS = asList("arpa", // internet infrastructure
+ "root" // diagnostic marker for non-truncated root zone
);
- private static final List<String> GENERIC_TLDS = asList(
- "aero", // air transport industry
- "asia", // Pan-Asia/Asia Pacific
- "biz", // businesses
- "cat", // Catalan linguistic/cultural community
- "com", // commercial enterprises
- "coop", // cooperative associations
- "info", // informational sites
- "jobs", // Human Resource managers
- "mobi", // mobile products and services
- "museum", // museums, surprisingly enough
- "name", // individuals' sites
- "net", // internet support infrastructure/business
- "org", // noncommercial organizations
- "pro", // credentialed professionals and entities
- "tel", // contact data for businesses and individuals
- "travel", // entities in the travel industry
- "gov", // United States Government
- "edu", // accredited postsecondary US education entities
- "mil", // United States Military
- "int" // organizations established by international treaty
+ private static final List<String> GENERIC_TLDS = asList("aero", // air transport industry
+ "asia", // Pan-Asia/Asia Pacific
+ "biz", // businesses
+ "cat", // Catalan linguistic/cultural community
+ "com", // commercial enterprises
+ "coop", // cooperative associations
+ "info", // informational sites
+ "jobs", // Human Resource managers
+ "mobi", // mobile products and services
+ "museum", // museums, surprisingly enough
+ "name", // individuals' sites
+ "net", // internet support infrastructure/business
+ "org", // noncommercial organizations
+ "pro", // credentialed professionals and entities
+ "tel", // contact data for businesses and individuals
+ "travel", // entities in the travel industry
+ "gov", // United States Government
+ "edu", // accredited postsecondary US education entities
+ "mil", // United States Military
+ "int" // organizations established by international treaty
);
- private static final List<String> COUNTRY_CODE_TLDS = asList(
- "ac", // Ascension Island
- "ad", // Andorra
- "ae", // United Arab Emirates
- "af", // Afghanistan
- "ag", // Antigua and Barbuda
- "ai", // Anguilla
- "al", // Albania
- "am", // Armenia
- "an", // Netherlands Antilles
- "ao", // Angola
- "aq", // Antarctica
- "ar", // Argentina
- "as", // American Samoa
- "at", // Austria
- "au", // Australia (includes Ashmore and Cartier Islands and Coral Sea Islands)
- "aw", // Aruba
- "ax", // Åland
- "az", // Azerbaijan
- "ba", // Bosnia and Herzegovina
- "bb", // Barbados
- "bd", // Bangladesh
- "be", // Belgium
- "bf", // Burkina Faso
- "bg", // Bulgaria
- "bh", // Bahrain
- "bi", // Burundi
- "bj", // Benin
- "bm", // Bermuda
- "bn", // Brunei Darussalam
- "bo", // Bolivia
- "br", // Brazil
- "bs", // Bahamas
- "bt", // Bhutan
- "bv", // Bouvet Island
- "bw", // Botswana
- "by", // Belarus
- "bz", // Belize
- "ca", // Canada
- "cc", // Cocos (Keeling) Islands
- "cd", // Democratic Republic of the Congo (formerly Zaire)
- "cf", // Central African Republic
- "cg", // Republic of the Congo
- "ch", // Switzerland
- "ci", // Côte d'Ivoire
- "ck", // Cook Islands
- "cl", // Chile
- "cm", // Cameroon
- "cn", // China, mainland
- "co", // Colombia
- "cr", // Costa Rica
- "cu", // Cuba
- "cv", // Cape Verde
- "cx", // Christmas Island
- "cy", // Cyprus
- "cz", // Czech Republic
- "de", // Germany
- "dj", // Djibouti
- "dk", // Denmark
- "dm", // Dominica
- "do", // Dominican Republic
- "dz", // Algeria
- "ec", // Ecuador
- "ee", // Estonia
- "eg", // Egypt
- "er", // Eritrea
- "es", // Spain
- "et", // Ethiopia
- "eu", // European Union
- "fi", // Finland
- "fj", // Fiji
- "fk", // Falkland Islands
- "fm", // Federated States of Micronesia
- "fo", // Faroe Islands
- "fr", // France
- "ga", // Gabon
- "gb", // Great Britain (United Kingdom)
- "gd", // Grenada
- "ge", // Georgia
- "gf", // French Guiana
- "gg", // Guernsey
- "gh", // Ghana
- "gi", // Gibraltar
- "gl", // Greenland
- "gm", // The Gambia
- "gn", // Guinea
- "gp", // Guadeloupe
- "gq", // Equatorial Guinea
- "gr", // Greece
- "gs", // South Georgia and the South Sandwich Islands
- "gt", // Guatemala
- "gu", // Guam
- "gw", // Guinea-Bissau
- "gy", // Guyana
- "hk", // Hong Kong
- "hm", // Heard Island and McDonald Islands
- "hn", // Honduras
- "hr", // Croatia (Hrvatska)
- "ht", // Haiti
- "hu", // Hungary
- "id", // Indonesia
- "ie", // Ireland (Éire)
- "il", // Israel
- "im", // Isle of Man
- "in", // India
- "io", // British Indian Ocean Territory
- "iq", // Iraq
- "ir", // Iran
- "is", // Iceland
- "it", // Italy
- "je", // Jersey
- "jm", // Jamaica
- "jo", // Jordan
- "jp", // Japan
- "ke", // Kenya
- "kg", // Kyrgyzstan
- "kh", // Cambodia (Khmer)
- "ki", // Kiribati
- "km", // Comoros
- "kn", // Saint Kitts and Nevis
- "kp", // North Korea
- "kr", // South Korea
- "kw", // Kuwait
- "ky", // Cayman Islands
- "kz", // Kazakhstan
- "la", // Laos (currently being marketed as the official domain for Los Angeles)
- "lb", // Lebanon
- "lc", // Saint Lucia
- "li", // Liechtenstein
- "lk", // Sri Lanka
- "lr", // Liberia
- "ls", // Lesotho
- "lt", // Lithuania
- "lu", // Luxembourg
- "lv", // Latvia
- "ly", // Libya
- "ma", // Morocco
- "mc", // Monaco
- "md", // Moldova
- "me", // Montenegro
- "mg", // Madagascar
- "mh", // Marshall Islands
- "mk", // Republic of Macedonia
- "ml", // Mali
- "mm", // Myanmar
- "mn", // Mongolia
- "mo", // Macau
- "mp", // Northern Mariana Islands
- "mq", // Martinique
- "mr", // Mauritania
- "ms", // Montserrat
- "mt", // Malta
- "mu", // Mauritius
- "mv", // Maldives
- "mw", // Malawi
- "mx", // Mexico
- "my", // Malaysia
- "mz", // Mozambique
- "na", // Namibia
- "nc", // New Caledonia
- "ne", // Niger
- "nf", // Norfolk Island
- "ng", // Nigeria
- "ni", // Nicaragua
- "nl", // Netherlands
- "no", // Norway
- "np", // Nepal
- "nr", // Nauru
- "nu", // Niue
- "nz", // New Zealand
- "om", // Oman
- "pa", // Panama
- "pe", // Peru
- "pf", // French Polynesia With Clipperton Island
- "pg", // Papua New Guinea
- "ph", // Philippines
- "pk", // Pakistan
- "pl", // Poland
- "pm", // Saint-Pierre and Miquelon
- "pn", // Pitcairn Islands
- "pr", // Puerto Rico
- "ps", // Palestinian territories (PA-controlled West Bank and Gaza Strip)
- "pt", // Portugal
- "pw", // Palau
- "py", // Paraguay
- "qa", // Qatar
- "re", // Réunion
- "ro", // Romania
- "rs", // Serbia
- "ru", // Russia
- "rw", // Rwanda
- "sa", // Saudi Arabia
- "sb", // Solomon Islands
- "sc", // Seychelles
- "sd", // Sudan
- "se", // Sweden
- "sg", // Singapore
- "sh", // Saint Helena
- "si", // Slovenia
- "sj", // Svalbard and Jan Mayen Islands Not in use (Norwegian dependencies; see .no)
- "sk", // Slovakia
- "sl", // Sierra Leone
- "sm", // San Marino
- "sn", // Senegal
- "so", // Somalia
- "sr", // Suriname
- "st", // São Tomé and Príncipe
- "su", // Soviet Union (deprecated)
- "sv", // El Salvador
- "sy", // Syria
- "sz", // Swaziland
- "tc", // Turks and Caicos Islands
- "td", // Chad
- "tf", // French Southern and Antarctic Lands
- "tg", // Togo
- "th", // Thailand
- "tj", // Tajikistan
- "tk", // Tokelau
- "tl", // East Timor (deprecated old code)
- "tm", // Turkmenistan
- "tn", // Tunisia
- "to", // Tonga
- "tp", // East Timor
- "tr", // Turkey
- "tt", // Trinidad and Tobago
- "tv", // Tuvalu
- "tw", // Taiwan, Republic of China
- "tz", // Tanzania
- "ua", // Ukraine
- "ug", // Uganda
- "uk", // United Kingdom
- "um", // United States Minor Outlying Islands
- "us", // United States of America
- "uy", // Uruguay
- "uz", // Uzbekistan
- "va", // Vatican City State
- "vc", // Saint Vincent and the Grenadines
- "ve", // Venezuela
- "vg", // British Virgin Islands
- "vi", // U.S. Virgin Islands
- "vn", // Vietnam
- "vu", // Vanuatu
- "wf", // Wallis and Futuna
- "ws", // Samoa (formerly Western Samoa)
- "ye", // Yemen
- "yt", // Mayotte
- "yu", // Serbia and Montenegro (originally Yugoslavia)
- "za", // South Africa
- "zm", // Zambia
- "zw" // Zimbabwe
+ private static final List<String> COUNTRY_CODE_TLDS = asList("ac", // Ascension Island
+ "ad", // Andorra
+ "ae", // United Arab Emirates
+ "af", // Afghanistan
+ "ag", // Antigua and Barbuda
+ "ai", // Anguilla
+ "al", // Albania
+ "am", // Armenia
+ "an", // Netherlands Antilles
+ "ao", // Angola
+ "aq", // Antarctica
+ "ar", // Argentina
+ "as", // American Samoa
+ "at", // Austria
+ "au", // Australia (includes Ashmore and Cartier Islands and Coral Sea Islands)
+ "aw", // Aruba
+ "ax", // Åland
+ "az", // Azerbaijan
+ "ba", // Bosnia and Herzegovina
+ "bb", // Barbados
+ "bd", // Bangladesh
+ "be", // Belgium
+ "bf", // Burkina Faso
+ "bg", // Bulgaria
+ "bh", // Bahrain
+ "bi", // Burundi
+ "bj", // Benin
+ "bm", // Bermuda
+ "bn", // Brunei Darussalam
+ "bo", // Bolivia
+ "br", // Brazil
+ "bs", // Bahamas
+ "bt", // Bhutan
+ "bv", // Bouvet Island
+ "bw", // Botswana
+ "by", // Belarus
+ "bz", // Belize
+ "ca", // Canada
+ "cc", // Cocos (Keeling) Islands
+ "cd", // Democratic Republic of the Congo (formerly Zaire)
+ "cf", // Central African Republic
+ "cg", // Republic of the Congo
+ "ch", // Switzerland
+ "ci", // Côte d'Ivoire
+ "ck", // Cook Islands
+ "cl", // Chile
+ "cm", // Cameroon
+ "cn", // China, mainland
+ "co", // Colombia
+ "cr", // Costa Rica
+ "cu", // Cuba
+ "cv", // Cape Verde
+ "cx", // Christmas Island
+ "cy", // Cyprus
+ "cz", // Czech Republic
+ "de", // Germany
+ "dj", // Djibouti
+ "dk", // Denmark
+ "dm", // Dominica
+ "do", // Dominican Republic
+ "dz", // Algeria
+ "ec", // Ecuador
+ "ee", // Estonia
+ "eg", // Egypt
+ "er", // Eritrea
+ "es", // Spain
+ "et", // Ethiopia
+ "eu", // European Union
+ "fi", // Finland
+ "fj", // Fiji
+ "fk", // Falkland Islands
+ "fm", // Federated States of Micronesia
+ "fo", // Faroe Islands
+ "fr", // France
+ "ga", // Gabon
+ "gb", // Great Britain (United Kingdom)
+ "gd", // Grenada
+ "ge", // Georgia
+ "gf", // French Guiana
+ "gg", // Guernsey
+ "gh", // Ghana
+ "gi", // Gibraltar
+ "gl", // Greenland
+ "gm", // The Gambia
+ "gn", // Guinea
+ "gp", // Guadeloupe
+ "gq", // Equatorial Guinea
+ "gr", // Greece
+ "gs", // South Georgia and the South Sandwich Islands
+ "gt", // Guatemala
+ "gu", // Guam
+ "gw", // Guinea-Bissau
+ "gy", // Guyana
+ "hk", // Hong Kong
+ "hm", // Heard Island and McDonald Islands
+ "hn", // Honduras
+ "hr", // Croatia (Hrvatska)
+ "ht", // Haiti
+ "hu", // Hungary
+ "id", // Indonesia
+ "ie", // Ireland (Éire)
+ "il", // Israel
+ "im", // Isle of Man
+ "in", // India
+ "io", // British Indian Ocean Territory
+ "iq", // Iraq
+ "ir", // Iran
+ "is", // Iceland
+ "it", // Italy
+ "je", // Jersey
+ "jm", // Jamaica
+ "jo", // Jordan
+ "jp", // Japan
+ "ke", // Kenya
+ "kg", // Kyrgyzstan
+ "kh", // Cambodia (Khmer)
+ "ki", // Kiribati
+ "km", // Comoros
+ "kn", // Saint Kitts and Nevis
+ "kp", // North Korea
+ "kr", // South Korea
+ "kw", // Kuwait
+ "ky", // Cayman Islands
+ "kz", // Kazakhstan
+ "la", // Laos (currently being marketed as the official domain for Los Angeles)
+ "lb", // Lebanon
+ "lc", // Saint Lucia
+ "li", // Liechtenstein
+ "lk", // Sri Lanka
+ "lr", // Liberia
+ "ls", // Lesotho
+ "lt", // Lithuania
+ "lu", // Luxembourg
+ "lv", // Latvia
+ "ly", // Libya
+ "ma", // Morocco
+ "mc", // Monaco
+ "md", // Moldova
+ "me", // Montenegro
+ "mg", // Madagascar
+ "mh", // Marshall Islands
+ "mk", // Republic of Macedonia
+ "ml", // Mali
+ "mm", // Myanmar
+ "mn", // Mongolia
+ "mo", // Macau
+ "mp", // Northern Mariana Islands
+ "mq", // Martinique
+ "mr", // Mauritania
+ "ms", // Montserrat
+ "mt", // Malta
+ "mu", // Mauritius
+ "mv", // Maldives
+ "mw", // Malawi
+ "mx", // Mexico
+ "my", // Malaysia
+ "mz", // Mozambique
+ "na", // Namibia
+ "nc", // New Caledonia
+ "ne", // Niger
+ "nf", // Norfolk Island
+ "ng", // Nigeria
+ "ni", // Nicaragua
+ "nl", // Netherlands
+ "no", // Norway
+ "np", // Nepal
+ "nr", // Nauru
+ "nu", // Niue
+ "nz", // New Zealand
+ "om", // Oman
+ "pa", // Panama
+ "pe", // Peru
+ "pf", // French Polynesia With Clipperton Island
+ "pg", // Papua New Guinea
+ "ph", // Philippines
+ "pk", // Pakistan
+ "pl", // Poland
+ "pm", // Saint-Pierre and Miquelon
+ "pn", // Pitcairn Islands
+ "pr", // Puerto Rico
+ "ps", // Palestinian territories (PA-controlled West Bank and Gaza Strip)
+ "pt", // Portugal
+ "pw", // Palau
+ "py", // Paraguay
+ "qa", // Qatar
+ "re", // Réunion
+ "ro", // Romania
+ "rs", // Serbia
+ "ru", // Russia
+ "rw", // Rwanda
+ "sa", // Saudi Arabia
+ "sb", // Solomon Islands
+ "sc", // Seychelles
+ "sd", // Sudan
+ "se", // Sweden
+ "sg", // Singapore
+ "sh", // Saint Helena
+ "si", // Slovenia
+ "sj", // Svalbard and Jan Mayen Islands Not in use (Norwegian dependencies; see .no)
+ "sk", // Slovakia
+ "sl", // Sierra Leone
+ "sm", // San Marino
+ "sn", // Senegal
+ "so", // Somalia
+ "sr", // Suriname
+ "st", // São Tomé and Príncipe
+ "su", // Soviet Union (deprecated)
+ "sv", // El Salvador
+ "sy", // Syria
+ "sz", // Swaziland
+ "tc", // Turks and Caicos Islands
+ "td", // Chad
+ "tf", // French Southern and Antarctic Lands
+ "tg", // Togo
+ "th", // Thailand
+ "tj", // Tajikistan
+ "tk", // Tokelau
+ "tl", // East Timor (deprecated old code)
+ "tm", // Turkmenistan
+ "tn", // Tunisia
+ "to", // Tonga
+ "tp", // East Timor
+ "tr", // Turkey
+ "tt", // Trinidad and Tobago
+ "tv", // Tuvalu
+ "tw", // Taiwan, Republic of China
+ "tz", // Tanzania
+ "ua", // Ukraine
+ "ug", // Uganda
+ "uk", // United Kingdom
+ "um", // United States Minor Outlying Islands
+ "us", // United States of America
+ "uy", // Uruguay
+ "uz", // Uzbekistan
+ "va", // Vatican City State
+ "vc", // Saint Vincent and the Grenadines
+ "ve", // Venezuela
+ "vg", // British Virgin Islands
+ "vi", // U.S. Virgin Islands
+ "vn", // Vietnam
+ "vu", // Vanuatu
+ "wf", // Wallis and Futuna
+ "ws", // Samoa (formerly Western Samoa)
+ "ye", // Yemen
+ "yt", // Mayotte
+ "yu", // Serbia and Montenegro (originally Yugoslavia)
+ "za", // South Africa
+ "zm", // Zambia
+ "zw" // Zimbabwe
);
- private static final List<String> LOCAL_TLDS = asList(
- "localhost", // RFC2606 defined
- "localdomain" // Also widely used as localhost.localdomain
- );
+ private static final List<String> LOCAL_TLDS = asList("localhost", // RFC2606 defined
+ "localdomain" // Also widely used as localhost.localdomain
+ );
/**
* {@inheritDoc}
Modified: bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java (original)
+++ bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java Tue Oct 25 15:34:35 2016
@@ -39,9 +39,9 @@ import static java.lang.annotation.Reten
* Description: annotation to validate a java.io.File is a directory<br/>
*/
@Documented
-@Constraint( validatedBy = InetAddressValidator.class )
-@Target( { FIELD, ANNOTATION_TYPE, PARAMETER } )
-@Retention( RUNTIME )
+@Constraint(validatedBy = InetAddressValidator.class)
+@Target({ FIELD, ANNOTATION_TYPE, PARAMETER })
+@Retention(RUNTIME)
public @interface InetAddress {
Class<?>[] groups() default {};
Modified: bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java (original)
+++ bval/trunk/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java Tue Oct 25 15:34:35 2016
@@ -29,10 +29,9 @@ import java.util.regex.Pattern;
*/
public class InetAddressValidator implements ConstraintValidator<InetAddress, String> {
- private static final Pattern IPV4_PATTERN = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\."
- + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\."
- + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\."
- + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");
+ private static final Pattern IPV4_PATTERN =
+ Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\."
+ + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\." + "([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");
/**
* {@inheritDoc}
Modified: bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java (original)
+++ bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java Tue Oct 25 15:34:35 2016
@@ -31,14 +31,7 @@ public class ABANumberValidatorTest exte
@Override
protected String[] getValid() {
- return new String[] {
- "123456780",
- "123123123",
- "011000015",
- "111000038",
- "231381116",
- "121181976"
- };
+ return new String[] { "123456780", "123123123", "011000015", "111000038", "231381116", "121181976" };
}
}
Modified: bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java (original)
+++ bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java Tue Oct 25 15:34:35 2016
@@ -60,7 +60,7 @@ public abstract class AbstractCheckDigit
protected abstract String[] getValid();
protected String[] getInvalid() {
- return new String[] {"12345678A"};
+ return new String[] { "12345678A" };
}
protected String getZeroSum() {
@@ -97,7 +97,7 @@ public abstract class AbstractCheckDigit
public void testIsValidTrue() {
// test valid values
for (int i = 0; i < valid.length; i++) {
- assertTrue("valid[" + i +"]: " + valid[i], routine.isValid(valid[i], null));
+ assertTrue("valid[" + i + "]: " + valid[i], routine.isValid(valid[i], null));
}
}
@@ -108,13 +108,14 @@ public abstract class AbstractCheckDigit
public void testIsValidFalse() {
// test invalid code values
for (int i = 0; i < invalid.length; i++) {
- assertFalse("invalid[" + i +"]: " + invalid[i], routine.isValid(invalid[i], null));
+ assertFalse("invalid[" + i + "]: " + invalid[i], routine.isValid(invalid[i], null));
}
// test invalid check digit values
String[] invalidCheckDigits = createInvalidCodes(valid);
for (int i = 0; i < invalidCheckDigits.length; i++) {
- assertFalse("invalid check digit[" + i +"]: " + invalidCheckDigits[i], routine.isValid(invalidCheckDigits[i], null));
+ assertFalse("invalid check digit[" + i + "]: " + invalidCheckDigits[i],
+ routine.isValid(invalidCheckDigits[i], null));
}
}
@@ -147,9 +148,9 @@ public abstract class AbstractCheckDigit
// create invalid check digit values
for (int i = 0; i < codes.length; i++) {
String code = removeCheckDigit(codes[i]);
- String check = checkDigit(codes[i]);
+ String check = checkDigit(codes[i]);
for (int j = 0; j < 10; j++) {
- String curr = "" + Character.forDigit(j, 10);
+ String curr = "" + Character.forDigit(j, 10);
if (!curr.equals(check)) {
list.add(code + curr);
}
Modified: bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java (original)
+++ bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java Tue Oct 25 15:34:35 2016
@@ -31,20 +31,12 @@ public class CUSIPValidatorTest extends
@Override
protected String[] getValid() {
- return new String[] {
- "037833100",
- "931142103",
- "837649128",
- "392690QT3",
- "594918104",
- "86770G101",
- "Y8295N109",
- "G8572F100"
- };
+ return new String[] { "037833100", "931142103", "837649128", "392690QT3", "594918104", "86770G101", "Y8295N109",
+ "G8572F100" };
}
@Override
protected String[] getInvalid() {
- return new String[] {"0378#3100"};
+ return new String[] { "0378#3100" };
}
}
Modified: bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java (original)
+++ bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java Tue Oct 25 15:34:35 2016
@@ -51,7 +51,8 @@ public class DomainValidatorTest {
assertTrue("single-character domain label should validate", validator.isValid("z.com", null));
- assertTrue("i.have.an-example.domain.name should validate", validator.isValid("i.have.an-example.domain.name", null));
+ assertTrue("i.have.an-example.domain.name should validate",
+ validator.isValid("i.have.an-example.domain.name", null));
}
@Test
@@ -61,7 +62,8 @@ public class DomainValidatorTest {
assertFalse("domain name containing spaces shouldn't validate", validator.isValid("apa che.org", null));
assertFalse("domain name starting with dash shouldn't validate", validator.isValid("-testdomain.name", null));
assertFalse("domain name ending with dash shouldn't validate", validator.isValid("testdomain-.name", null));
- assertFalse("domain name starting with multiple dashes shouldn't validate", validator.isValid("---c.com", null));
+ assertFalse("domain name starting with multiple dashes shouldn't validate",
+ validator.isValid("---c.com", null));
assertFalse("domain name ending with multiple dashes shouldn't validate", validator.isValid("c--.com", null));
assertFalse("domain name with invalid TLD shouldn't validate", validator.isValid("apache.rog", null));
@@ -94,10 +96,9 @@ public class DomainValidatorTest {
@Test
public void testAllowLocal() {
- DomainValidator noLocal = new DomainValidator();
- DomainValidator allowLocal = new DomainValidator();
- allowLocal.initialize( new Domain()
- {
+ DomainValidator noLocal = new DomainValidator();
+ DomainValidator allowLocal = new DomainValidator();
+ allowLocal.initialize(new Domain() {
@Override
public Class<? extends Annotation> annotationType() {
@@ -130,24 +131,24 @@ public class DomainValidatorTest {
}
});
- // Default won't allow local
- assertFalse("localhost.localdomain should validate", noLocal.isValid("localhost.localdomain", null));
- assertFalse("localhost should validate", noLocal.isValid("localhost", null));
-
- // But it may be requested
- assertTrue("localhost.localdomain should validate", allowLocal.isValid("localhost.localdomain", null));
- assertTrue("localhost should validate", allowLocal.isValid("localhost", null));
- assertTrue("hostname should validate", allowLocal.isValid("hostname", null));
- assertTrue("machinename should validate", allowLocal.isValid("machinename", null));
-
- // Check the localhost one with a few others
- assertTrue("apache.org should validate", allowLocal.isValid("apache.org", null));
- assertFalse("domain name with spaces shouldn't validate", allowLocal.isValid(" apache.org ", null));
+ // Default won't allow local
+ assertFalse("localhost.localdomain should validate", noLocal.isValid("localhost.localdomain", null));
+ assertFalse("localhost should validate", noLocal.isValid("localhost", null));
+
+ // But it may be requested
+ assertTrue("localhost.localdomain should validate", allowLocal.isValid("localhost.localdomain", null));
+ assertTrue("localhost should validate", allowLocal.isValid("localhost", null));
+ assertTrue("hostname should validate", allowLocal.isValid("hostname", null));
+ assertTrue("machinename should validate", allowLocal.isValid("machinename", null));
+
+ // Check the localhost one with a few others
+ assertTrue("apache.org should validate", allowLocal.isValid("apache.org", null));
+ assertFalse("domain name with spaces shouldn't validate", allowLocal.isValid(" apache.org ", null));
}
@Test
public void testIDN() {
- assertTrue("b\u00fccher.ch in IDN should validate", validator.isValid("www.xn--bcher-kva.ch", null));
+ assertTrue("b\u00fccher.ch in IDN should validate", validator.isValid("www.xn--bcher-kva.ch", null));
}
}
Modified: bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/InetAddressValidatorTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/InetAddressValidatorTest.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/InetAddressValidatorTest.java (original)
+++ bval/trunk/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/InetAddressValidatorTest.java Tue Oct 25 15:34:35 2016
@@ -43,10 +43,10 @@ public class InetAddressValidatorTest {
*/
@Test
public void testInetAddressesFromTheWild() {
- assertTrue("www.apache.org IP should be valid", validator.isValid("140.211.11.130", null));
- assertTrue("www.l.google.com IP should be valid", validator.isValid("72.14.253.103", null));
- assertTrue("fsf.org IP should be valid", validator.isValid("199.232.41.5", null));
- assertTrue("appscs.ign.com IP should be valid", validator.isValid("216.35.123.87", null));
+ assertTrue("www.apache.org IP should be valid", validator.isValid("140.211.11.130", null));
+ assertTrue("www.l.google.com IP should be valid", validator.isValid("72.14.253.103", null));
+ assertTrue("fsf.org IP should be valid", validator.isValid("199.232.41.5", null));
+ assertTrue("appscs.ign.com IP should be valid", validator.isValid("216.35.123.87", null));
}
/**
@@ -54,20 +54,20 @@ public class InetAddressValidatorTest {
*/
@Test
public void testInetAddressesByClass() {
- assertTrue("class A IP should be valid", validator.isValid("24.25.231.12", null));
- assertFalse("illegal class A IP should be invalid", validator.isValid("2.41.32.324", null));
+ assertTrue("class A IP should be valid", validator.isValid("24.25.231.12", null));
+ assertFalse("illegal class A IP should be invalid", validator.isValid("2.41.32.324", null));
- assertTrue("class B IP should be valid", validator.isValid("135.14.44.12", null));
- assertFalse("illegal class B IP should be invalid", validator.isValid("154.123.441.123", null));
+ assertTrue("class B IP should be valid", validator.isValid("135.14.44.12", null));
+ assertFalse("illegal class B IP should be invalid", validator.isValid("154.123.441.123", null));
- assertTrue("class C IP should be valid", validator.isValid("213.25.224.32", null));
- assertFalse("illegal class C IP should be invalid", validator.isValid("201.543.23.11", null));
+ assertTrue("class C IP should be valid", validator.isValid("213.25.224.32", null));
+ assertFalse("illegal class C IP should be invalid", validator.isValid("201.543.23.11", null));
- assertTrue("class D IP should be valid", validator.isValid("229.35.159.6", null));
- assertFalse("illegal class D IP should be invalid", validator.isValid("231.54.11.987", null));
+ assertTrue("class D IP should be valid", validator.isValid("229.35.159.6", null));
+ assertFalse("illegal class D IP should be invalid", validator.isValid("231.54.11.987", null));
- assertTrue("class E IP should be valid", validator.isValid("248.85.24.92", null));
- assertFalse("illegal class E IP should be invalid", validator.isValid("250.21.323.48", null));
+ assertTrue("class E IP should be valid", validator.isValid("248.85.24.92", null));
+ assertFalse("illegal class E IP should be invalid", validator.isValid("250.21.323.48", null));
}
/**
@@ -75,8 +75,8 @@ public class InetAddressValidatorTest {
*/
@Test
public void testReservedInetAddresses() {
- assertTrue("localhost IP should be valid", validator.isValid("127.0.0.1", null));
- assertTrue("broadcast IP should be valid", validator.isValid("255.255.255.255", null));
+ assertTrue("localhost IP should be valid", validator.isValid("127.0.0.1", null));
+ assertTrue("broadcast IP should be valid", validator.isValid("255.255.255.255", null));
}
/**
@@ -84,9 +84,9 @@ public class InetAddressValidatorTest {
*/
@Test
public void testBrokenInetAddresses() {
- assertFalse("IP with characters should be invalid", validator.isValid("124.14.32.abc", null));
+ assertFalse("IP with characters should be invalid", validator.isValid("124.14.32.abc", null));
assertFalse("IP with three groups should be invalid", validator.isValid("23.64.12", null));
- assertFalse("IP with five groups should be invalid", validator.isValid("26.34.23.77.234", null));
+ assertFalse("IP with five groups should be invalid", validator.isValid("26.34.23.77.234", null));
}
}
Modified: bval/trunk/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java (original)
+++ bval/trunk/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java Tue Oct 25 15:34:35 2016
@@ -46,7 +46,7 @@ public class JSONGenerator {
public JSONGenerator(String templateName) throws IOException {
Configuration freemarker = new Configuration();
- freemarker.setNumberFormat("0.######"); // prevent locale-sensitive number format
+ freemarker.setNumberFormat("0.######"); // prevent locale-sensitive number format
freemarker.setClassForTemplateLoading(getClass(), "");
template = freemarker.getTemplate(templateName);
}
@@ -61,15 +61,13 @@ public class JSONGenerator {
return toJSON(metaBeans);
}
- public String toJSON(Collection<MetaBean> metaBeans)
- throws IOException, TemplateException {
+ public String toJSON(Collection<MetaBean> metaBeans) throws IOException, TemplateException {
final StringWriter out = new StringWriter();
toJSON(metaBeans, out);
return out.toString();
}
- public void toJSON(Collection<MetaBean> metaBeans, Writer out)
- throws IOException, TemplateException {
+ public void toJSON(Collection<MetaBean> metaBeans, Writer out) throws IOException, TemplateException {
Map<String, Object> rootMap = new HashMap<String, Object>();
rootMap.put("metaBeans", metaBeans);
rootMap.put("generator", this);
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValBinding.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValBinding.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValBinding.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValBinding.java Tue Oct 25 15:34:35 2016
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
* Custom {@link InterceptorBinding} to invoke executable validations on CDI beans.
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
+@Target({ ElementType.TYPE })
@InterceptorBinding
public @interface BValBinding {
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java Tue Oct 25 15:34:35 2016
@@ -42,7 +42,6 @@ import javax.validation.executable.Valid
import javax.validation.metadata.BeanDescriptor;
import javax.validation.metadata.MethodType;
-
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.Collection;
@@ -61,7 +60,7 @@ public class BValExtension implements Ex
private static final Logger LOGGER = Logger.getLogger(BValExtension.class.getName());
private static final AnnotatedTypeFilter DEFAULT_ANNOTATED_TYPE_FILTER = new AnnotatedTypeFilter() {
-
+
@Override
public boolean accept(AnnotatedType<?> annotatedType) {
return !annotatedType.getJavaClass().getName().startsWith("org.apache.bval.");
@@ -93,14 +92,17 @@ public class BValExtension implements Ex
config = Validation.byDefaultProvider().configure();
try {
final BootstrapConfiguration bootstrap = config.getBootstrapConfiguration();
- globalExecutableTypes = Collections.unmodifiableSet(convertToRuntimeTypes(bootstrap.getDefaultValidatedExecutableTypes()));
+ globalExecutableTypes =
+ Collections.unmodifiableSet(convertToRuntimeTypes(bootstrap.getDefaultValidatedExecutableTypes()));
isExecutableValidationEnabled = bootstrap.isExecutableValidationEnabled();
// TODO we never contain IMPLICIT or ALL
- validBean = globalExecutableTypes.contains(ExecutableType.IMPLICIT) || globalExecutableTypes.contains(ExecutableType.ALL);
+ validBean = globalExecutableTypes.contains(ExecutableType.IMPLICIT)
+ || globalExecutableTypes.contains(ExecutableType.ALL);
validConstructors = validBean || globalExecutableTypes.contains(ExecutableType.CONSTRUCTORS);
validBusinessMethods = validBean || globalExecutableTypes.contains(ExecutableType.NON_GETTER_METHODS);
- validGetterMethods = globalExecutableTypes.contains(ExecutableType.ALL) || globalExecutableTypes.contains(ExecutableType.GETTER_METHODS);
+ validGetterMethods = globalExecutableTypes.contains(ExecutableType.ALL)
+ || globalExecutableTypes.contains(ExecutableType.GETTER_METHODS);
} catch (final Exception e) { // custom providers can throw an exception
LOGGER.log(Level.SEVERE, e.getMessage(), e);
@@ -121,7 +123,8 @@ public class BValExtension implements Ex
validator = factory.getValidator();
}
- private static Set<ExecutableType> convertToRuntimeTypes(final Set<ExecutableType> defaultValidatedExecutableTypes) {
+ private static Set<ExecutableType> convertToRuntimeTypes(
+ final Set<ExecutableType> defaultValidatedExecutableTypes) {
final Set<ExecutableType> types = EnumSet.noneOf(ExecutableType.class);
for (final ExecutableType type : defaultValidatedExecutableTypes) {
if (ExecutableType.NONE == type) {
@@ -172,14 +175,14 @@ public class BValExtension implements Ex
try {
final BeanDescriptor classConstraints = validator.getConstraintsForClass(javaClass);
if (annotatedType.isAnnotationPresent(ValidateOnExecution.class)
- || hasValidationAnnotation(annotatedType.getMethods())
- || hasValidationAnnotation(annotatedType.getConstructors())
- || classConstraints != null
- && (validBean && classConstraints.isBeanConstrained()
- || validConstructors && !classConstraints.getConstrainedConstructors().isEmpty()
- || validBusinessMethods && !classConstraints.getConstrainedMethods(MethodType.NON_GETTER).isEmpty()
- || validGetterMethods && !classConstraints.getConstrainedMethods(MethodType.GETTER).isEmpty())
- ) {
+ || hasValidationAnnotation(annotatedType.getMethods())
+ || hasValidationAnnotation(annotatedType.getConstructors())
+ || classConstraints != null && (validBean && classConstraints.isBeanConstrained()
+ || validConstructors && !classConstraints.getConstrainedConstructors().isEmpty()
+ || validBusinessMethods
+ && !classConstraints.getConstrainedMethods(MethodType.NON_GETTER).isEmpty()
+ || validGetterMethods
+ && !classConstraints.getConstrainedMethods(MethodType.GETTER).isEmpty())) {
final BValAnnotatedType<A> bValAnnotatedType = new BValAnnotatedType<A>(annotatedType);
pat.setAnnotatedType(bValAnnotatedType);
}
@@ -194,7 +197,8 @@ public class BValExtension implements Ex
}
}
- private static <A> boolean hasValidationAnnotation(final Collection<? extends AnnotatedCallable<? super A>> methods) {
+ private static <A> boolean hasValidationAnnotation(
+ final Collection<? extends AnnotatedCallable<? super A>> methods) {
for (final AnnotatedCallable<? super A> m : methods) {
if (m.isAnnotationPresent(ValidateOnExecution.class)) {
return true;
@@ -299,7 +303,8 @@ public class BValExtension implements Ex
private final InjectionTarget<T> injectionTarget;
private final T instance;
- private Releasable(final CreationalContext<T> context, final InjectionTarget<T> injectionTarget, final T instance) {
+ private Releasable(final CreationalContext<T> context, final InjectionTarget<T> injectionTarget,
+ final T instance) {
this.context = context;
this.injectionTarget = injectionTarget;
this.instance = instance;
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptor.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptor.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptor.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptor.java Tue Oct 25 15:34:35 2016
@@ -124,9 +124,8 @@ public class BValInterceptor implements
return context.proceed();
}
- final MethodDescriptor constraintsForMethod =
- validator.getConstraintsForClass(targetClass).getConstraintsForMethod(method.getName(),
- method.getParameterTypes());
+ final MethodDescriptor constraintsForMethod = validator.getConstraintsForClass(targetClass)
+ .getConstraintsForMethod(method.getName(), method.getParameterTypes());
if (constraintsForMethod == null) {
return context.proceed();
}
@@ -161,7 +160,8 @@ public class BValInterceptor implements
if (constructorValidated == null) {
synchronized (this) {
if (constructorValidated == null) {
- final AnnotatedType<?> annotatedType = CDI.current().getBeanManager().createAnnotatedType(constructor.getDeclaringClass());
+ final AnnotatedType<?> annotatedType =
+ CDI.current().getBeanManager().createAnnotatedType(constructor.getDeclaringClass());
AnnotatedConstructor<?> annotatedConstructor = null;
for (final AnnotatedConstructor<?> ac : annotatedType.getConstructors()) {
if (!constructor.equals(ac.getJavaMember())) {
@@ -170,16 +170,15 @@ public class BValInterceptor implements
annotatedConstructor = ac;
break;
}
- final ValidateOnExecution annotation = annotatedConstructor != null ?
- annotatedConstructor.getAnnotation(ValidateOnExecution.class) :
- targetClass.getConstructor(constructor.getParameterTypes()).getAnnotation(ValidateOnExecution.class);
+ final ValidateOnExecution annotation = annotatedConstructor != null
+ ? annotatedConstructor.getAnnotation(ValidateOnExecution.class) : targetClass
+ .getConstructor(constructor.getParameterTypes()).getAnnotation(ValidateOnExecution.class);
if (annotation == null) {
constructorValidated = classConfiguration.contains(ExecutableType.CONSTRUCTORS);
} else {
final Collection<ExecutableType> types = Arrays.asList(annotation.type());
- constructorValidated =
- types.contains(ExecutableType.CONSTRUCTORS) || types.contains(ExecutableType.IMPLICIT)
- || types.contains(ExecutableType.ALL);
+ constructorValidated = types.contains(ExecutableType.CONSTRUCTORS)
+ || types.contains(ExecutableType.IMPLICIT) || types.contains(ExecutableType.ALL);
}
}
}
@@ -205,7 +204,7 @@ public class BValInterceptor implements
methodConfig = methodConfiguration.get(method);
if (methodConfig == null) {
final List<Class<?>> classHierarchy =
- ClassHelper.fillFullClassHierarchyAsList(new LinkedList<Class<?>>(), targetClass);
+ ClassHelper.fillFullClassHierarchyAsList(new LinkedList<Class<?>>(), targetClass);
Collections.reverse(classHierarchy);
// search on method @ValidateOnExecution
@@ -216,7 +215,8 @@ public class BValInterceptor implements
AnnotatedMethod<?> annotatedMethod = null;
for (final AnnotatedMethod<?> m : annotatedType.getMethods()) {
if (!m.getJavaMember().getName().equals(method.getName())
- || !asList(method.getGenericParameterTypes()).equals(asList(m.getJavaMember().getGenericParameterTypes()))) {
+ || !asList(method.getGenericParameterTypes())
+ .equals(asList(m.getJavaMember().getGenericParameterTypes()))) {
continue;
}
annotatedMethod = m;
@@ -286,7 +286,8 @@ public class BValInterceptor implements
if (classConfiguration == null) {
classConfiguration = EnumSet.noneOf(ExecutableType.class);
- final AnnotatedType<?> annotatedType = CDI.current().getBeanManager().createAnnotatedType(targetClass);
+ final AnnotatedType<?> annotatedType =
+ CDI.current().getBeanManager().createAnnotatedType(targetClass);
final ValidateOnExecution annotation = annotatedType.getAnnotation(ValidateOnExecution.class);
if (annotation == null) {
classConfiguration.addAll(globalConfiguration.getGlobalExecutableTypes());
@@ -325,13 +326,13 @@ public class BValInterceptor implements
}
private static boolean doValidMethod(final Method method, final Set<ExecutableType> config) {
- return isGetter(method) ? config.contains(ExecutableType.GETTER_METHODS) : config
- .contains(ExecutableType.NON_GETTER_METHODS);
+ return isGetter(method) ? config.contains(ExecutableType.GETTER_METHODS)
+ : config.contains(ExecutableType.NON_GETTER_METHODS);
}
private static boolean isGetter(final Method method) {
final String name = method.getName();
return method.getParameterTypes().length == 0 && !Void.TYPE.equals(method.getReturnType())
&& (name.startsWith("get") || name.startsWith("is") && boolean.class.equals(method.getReturnType()));
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptorBean.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptorBean.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptorBean.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptorBean.java Tue Oct 25 15:34:35 2016
@@ -54,9 +54,8 @@ public class BValInterceptorBean impleme
qualifiers = Collections.unmodifiableSet(q);
injectionTarget = bm.createInjectionTarget(bm.createAnnotatedType(BValInterceptor.class));
- injectionPoints =
- Collections.singleton(InjectionPoint.class.cast(new BValInterceptorInjectionPoint(this, injectionTarget
- .getInjectionPoints().iterator().next())));
+ injectionPoints = Collections.singleton(InjectionPoint.class
+ .cast(new BValInterceptorInjectionPoint(this, injectionTarget.getInjectionPoints().iterator().next())));
}
@Override
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/EmptyAnnotationLiteral.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/EmptyAnnotationLiteral.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/EmptyAnnotationLiteral.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/EmptyAnnotationLiteral.java Tue Oct 25 15:34:35 2016
@@ -29,12 +29,10 @@ import javax.enterprise.util.AnnotationL
* Taken from Apache OpenWebBeans.
* @param <T>
*/
-public abstract class EmptyAnnotationLiteral<T extends Annotation> extends AnnotationLiteral<T>
-{
+public abstract class EmptyAnnotationLiteral<T extends Annotation> extends AnnotationLiteral<T> {
private Class<T> annotationType;
- protected EmptyAnnotationLiteral()
- {
+ protected EmptyAnnotationLiteral() {
// Leave this constructor protected, because an EmptyAnnotationLiteral may never directly be instantiated
}
@@ -43,10 +41,8 @@ public abstract class EmptyAnnotationLit
* See OWB-802.
*/
@Override
- public Class<? extends Annotation> annotationType()
- {
- if (annotationType == null)
- {
+ public Class<? extends Annotation> annotationType() {
+ if (annotationType == null) {
annotationType = getAnnotationType(getClass());
}
return annotationType;
@@ -62,8 +58,7 @@ public abstract class EmptyAnnotationLit
* @return always 0
*/
@Override
- public int hashCode()
- {
+ public int hashCode() {
return 0;
}
@@ -73,50 +68,37 @@ public abstract class EmptyAnnotationLit
* as there are no members in this annotation at all.
*/
@Override
- public boolean equals(final Object other)
- {
+ public boolean equals(final Object other) {
// implemented for performance reasons
- return Annotation.class.isInstance(other) &&
- Annotation.class.cast(other).annotationType().equals(annotationType());
+ return Annotation.class.isInstance(other)
+ && Annotation.class.cast(other).annotationType().equals(annotationType());
}
- private Class<T> getAnnotationType(Class<?> definedClazz)
- {
+ private Class<T> getAnnotationType(Class<?> definedClazz) {
Type superClazz = definedClazz.getGenericSuperclass();
Class<T> clazz = null;
- if (superClazz.equals(Object.class))
- {
+ if (superClazz.equals(Object.class)) {
throw new RuntimeException("Super class must be parametrized type!");
- }
- else if (superClazz instanceof ParameterizedType)
- {
+ } else if (superClazz instanceof ParameterizedType) {
ParameterizedType paramType = (ParameterizedType) superClazz;
Type[] actualArgs = paramType.getActualTypeArguments();
- if (actualArgs.length == 1)
- {
+ if (actualArgs.length == 1) {
//Actual annotation type
Type type = actualArgs[0];
- if (type instanceof Class)
- {
+ if (type instanceof Class) {
clazz = (Class<T>) type;
return clazz;
- }
- else
- {
+ } else {
throw new RuntimeException("Not class type!");
}
- }
- else
- {
+ } else {
throw new RuntimeException("More than one parametric type!");
}
- }
- else
- {
+ } else {
return getAnnotationType((Class<?>) superClazz);
}
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorBean.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorBean.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorBean.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorBean.java Tue Oct 25 15:34:35 2016
@@ -34,7 +34,7 @@ import java.util.Set;
/**
* {@link Validator} CDI {@link Bean}.
*/
-public class ValidatorBean implements Bean<Validator> , PassivationCapable {
+public class ValidatorBean implements Bean<Validator>, PassivationCapable {
private final Set<Type> types;
private final Set<Annotation> qualifiers;
private final ValidatorFactory factory;
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java Tue Oct 25 15:34:35 2016
@@ -33,7 +33,7 @@ import java.util.Set;
/**
* {@link ValidatorFactory} CDI {@link Bean}.
*/
-public class ValidatorFactoryBean implements Bean<ValidatorFactory> , PassivationCapable{
+public class ValidatorFactoryBean implements Bean<ValidatorFactory>, PassivationCapable {
private final Set<Type> types;
private final Set<Annotation> qualifiers;
private final ValidatorFactory instance;
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMaxValidatorForNumber.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMaxValidatorForNumber.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMaxValidatorForNumber.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMaxValidatorForNumber.java Tue Oct 25 15:34:35 2016
@@ -50,5 +50,5 @@ public class DecimalMaxValidatorForNumbe
return (new BigDecimal((BigInteger) value)).compareTo(maxValue) != 1;
}
return (new BigDecimal(value.doubleValue()).compareTo(maxValue)) != 1;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/Email.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/Email.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/Email.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/Email.java Tue Oct 25 15:34:35 2016
@@ -41,7 +41,7 @@ import static java.lang.annotation.Reten
*/
@Documented
@Constraint(validatedBy = EmailValidator.class)
-@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER})
+@Target({ METHOD, FIELD, ANNOTATION_TYPE, PARAMETER })
@Retention(RUNTIME)
public @interface Email {
Class<?>[] groups() default {};
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/EmailValidator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/EmailValidator.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/EmailValidator.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/EmailValidator.java Tue Oct 25 15:34:35 2016
@@ -23,7 +23,6 @@ import org.apache.bval.routines.EMailVal
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
-
/**
* Description: <br/>
*/
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/FutureValidatorForCalendar.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/FutureValidatorForCalendar.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/FutureValidatorForCalendar.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/FutureValidatorForCalendar.java Tue Oct 25 15:34:35 2016
@@ -37,7 +37,6 @@ public class FutureValidatorForCalendar
return cal == null || cal.after(now());
}
-
/**
* overwrite when you need a different algorithm for 'now'.
*
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmpty.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmpty.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmpty.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmpty.java Tue Oct 25 15:34:35 2016
@@ -37,10 +37,9 @@ import static java.lang.annotation.Reten
* </pre>
*/
@Documented
-@Constraint(
- validatedBy = {NotEmptyValidatorForCollection.class, NotEmptyValidatorForMap.class,
- NotEmptyValidatorForString.class, NotEmptyValidator.class})
-@Target({METHOD, FIELD, ANNOTATION_TYPE, PARAMETER})
+@Constraint(validatedBy = { NotEmptyValidatorForCollection.class, NotEmptyValidatorForMap.class,
+ NotEmptyValidatorForString.class, NotEmptyValidator.class })
+@Target({ METHOD, FIELD, ANNOTATION_TYPE, PARAMETER })
@Retention(RUNTIME)
public @interface NotEmpty {
Class<?>[] groups() default {};
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/PastValidatorForCalendar.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/PastValidatorForCalendar.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/PastValidatorForCalendar.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/PastValidatorForCalendar.java Tue Oct 25 15:34:35 2016
@@ -37,7 +37,6 @@ public class PastValidatorForCalendar im
return cal == null || cal.before(now());
}
-
/**
* overwrite when you need a different algorithm for 'now'.
*
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/PatternValidator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/PatternValidator.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/PatternValidator.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/PatternValidator.java Tue Oct 25 15:34:35 2016
@@ -45,7 +45,6 @@ public class PatternValidator implements
}
}
-
@Override
public boolean isValid(String value, ConstraintValidatorContext context) {
return value == null || pattern.matcher(value).matches();
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfBoolean.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfBoolean.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfBoolean.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfBoolean.java Tue Oct 25 15:34:35 2016
@@ -41,5 +41,5 @@ public class SizeValidatorForArrayOfBool
}
final int length = Array.getLength(array);
return length >= min && length <= max;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfByte.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfByte.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfByte.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfByte.java Tue Oct 25 15:34:35 2016
@@ -41,5 +41,5 @@ public class SizeValidatorForArrayOfByte
}
final int length = Array.getLength(array);
return length >= min && length <= max;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfChar.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfChar.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfChar.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfChar.java Tue Oct 25 15:34:35 2016
@@ -41,5 +41,5 @@ public class SizeValidatorForArrayOfChar
}
final int length = Array.getLength(array);
return length >= min && length <= max;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfDouble.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfDouble.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfDouble.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfDouble.java Tue Oct 25 15:34:35 2016
@@ -41,5 +41,5 @@ public class SizeValidatorForArrayOfDoub
}
final int length = Array.getLength(array);
return length >= min && length <= max;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfFloat.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfFloat.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfFloat.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfFloat.java Tue Oct 25 15:34:35 2016
@@ -41,5 +41,5 @@ public class SizeValidatorForArrayOfFloa
}
final int length = Array.getLength(array);
return length >= min && length <= max;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfInt.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfInt.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfInt.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfInt.java Tue Oct 25 15:34:35 2016
@@ -41,5 +41,5 @@ public class SizeValidatorForArrayOfInt
}
final int length = Array.getLength(array);
return length >= min && length <= max;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfLong.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfLong.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfLong.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfLong.java Tue Oct 25 15:34:35 2016
@@ -41,5 +41,5 @@ public class SizeValidatorForArrayOfLong
}
final int length = Array.getLength(array);
return length >= min && length <= max;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfShort.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfShort.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfShort.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfShort.java Tue Oct 25 15:34:35 2016
@@ -41,5 +41,5 @@ public class SizeValidatorForArrayOfShor
}
final int length = Array.getLength(array);
return length >= min && length <= max;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForMap.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForMap.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForMap.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForMap.java Tue Oct 25 15:34:35 2016
@@ -41,6 +41,6 @@ public class SizeValidatorForMap extends
}
final int size = map.size();
return size >= min && size <= max;
- }
+ }
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java?rev=1766546&r1=1766545&r2=1766546&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java Tue Oct 25 15:34:35 2016
@@ -48,18 +48,22 @@ public final class ELFacade implements M
private static final ELResolver RESOLVER = initResolver();
@Override
- public String interpolate(final String message, final Map<String, Object> annotationParameters, final Object validatedValue) {
+ public String interpolate(final String message, final Map<String, Object> annotationParameters,
+ final Object validatedValue) {
try {
if (EXPRESSION_FACTORY != null) {
final BValELContext context = new BValELContext();
final VariableMapper variables = context.getVariableMapper();
for (final Map.Entry<String, Object> var : annotationParameters.entrySet()) {
- variables.setVariable(var.getKey(), EXPRESSION_FACTORY.createValueExpression(var.getValue(), Object.class));
+ variables.setVariable(var.getKey(),
+ EXPRESSION_FACTORY.createValueExpression(var.getValue(), Object.class));
}
- variables.setVariable("validatedValue", EXPRESSION_FACTORY.createValueExpression(validatedValue, Object.class));
+ variables.setVariable("validatedValue",
+ EXPRESSION_FACTORY.createValueExpression(validatedValue, Object.class));
// #{xxx} shouldn't be evaluated
- return EXPRESSION_FACTORY.createValueExpression(context, message.replace("#{", "\\#{"), String.class).getValue(context).toString();
+ return EXPRESSION_FACTORY.createValueExpression(context, message.replace("#{", "\\#{"), String.class)
+ .getValue(context).toString();
}
} catch (final Exception e) {
// no-op
@@ -132,7 +136,7 @@ public final class ELFacade implements M
public static class BValFormatter {
private final Formatter formatter = new Formatter();
- public Formatter format(final String format, final Object ... args) {
+ public Formatter format(final String format, final Object... args) {
return formatter.format(format, args);
}
}