Skip to content

Commit bf9fa59

Browse files
authored
Merge pull request #25 from NotNinja/develop
Release 0.3.0
2 parents 83e60aa + a865615 commit bf9fa59

File tree

180 files changed

+1391
-1222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+1391
-1222
lines changed

.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,3 @@ addons:
88
- oracle-java8-installer
99
after_success:
1010
- bash <(curl -s https://codecov.io/bash)
11-
notifications:
12-
webhooks:
13-
urls:
14-
- https://webhooks.gitter.im/e/a4d2c0b15b94444b173e
15-
on_success: always
16-
on_failure: always
17-
on_start: never

AUTHORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Authors ordered by first contribution
22

3-
* Alasdair Mercer <alasdair@skelp.io>
3+
* Alasdair Mercer <mercer.alasdair@gmail.com>

CHANGES.md

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1+
## Version 0.3.0, 2017.10.03
2+
3+
* ServiceLoaders being loaded multiple times so providers are not being cached [#23](https://github.com/NotNinja/verifier/issues/23)
4+
* Move from `io.skelp:verifier` to `org.notninja:verifier` (**breaking change**)
5+
16
## Version 0.2.0, 2017.02.11
27

3-
* Drop support for Java 7 [#9](https://github.com/Skelp/verifier/issues/9) (**breaking change**)
4-
* Support nested arrays and circular references in `DefaultArrayFormatter` [#10](https://github.com/Skelp/verifier/issues/10)
5-
* Support different locales [#11](https://github.com/Skelp/verifier/issues/11) (**breaking change**)
6-
* Support multiple verification reporters [#14](https://github.com/Skelp/verifier/issues/14) (**breaking change**)
7-
* Add `ClassVerifier#assignableFromAll` & `ClassVerifier#assignableFromAny` [#15](https://github.com/Skelp/verifier/issues/15)
8-
* Rename `ClassVerifier#interfacing` to `ClassVerifier#interfaced` [#16](https://github.com/Skelp/verifier/issues/16) (**breaking change**)
9-
* Rename `LocaleVerifier#defaulting` to `LocaleVerifier#defaulted` [#17](https://github.com/Skelp/verifier/issues/17) (**breaking change**)
10-
* Add `StringVerifier#matchAll` & `StringVerifier#matchAny` [#18](https://github.com/Skelp/verifier/issues/18)
11-
* Add `ThrowableVerifier#causedByAll` & `ThrowableVerifier#causedByAny` [#19](https://github.com/Skelp/verifier/issues/19)
12-
* Add more formatters [#21](https://github.com/Skelp/verifier/issues/21)
13-
* Add CustomVerifier#and & CustomVerifier#andComparable methods to allow even more fluid chaining [#22](https://github.com/Skelp/verifier/issues/22)
8+
* Drop support for Java 7 [#9](https://github.com/NotNinja/verifier/issues/9) (**breaking change**)
9+
* Support nested arrays and circular references in `DefaultArrayFormatter` [#10](https://github.com/NotNinja/verifier/issues/10)
10+
* Support different locales [#11](https://github.com/NotNinja/verifier/issues/11) (**breaking change**)
11+
* Support multiple verification reporters [#14](https://github.com/NotNinja/verifier/issues/14) (**breaking change**)
12+
* Add `ClassVerifier#assignableFromAll` & `ClassVerifier#assignableFromAny` [#15](https://github.com/NotNinja/verifier/issues/15)
13+
* Rename `ClassVerifier#interfacing` to `ClassVerifier#interfaced` [#16](https://github.com/NotNinja/verifier/issues/16) (**breaking change**)
14+
* Rename `LocaleVerifier#defaulting` to `LocaleVerifier#defaulted` [#17](https://github.com/NotNinja/verifier/issues/17) (**breaking change**)
15+
* Add `StringVerifier#matchAll` & `StringVerifier#matchAny` [#18](https://github.com/NotNinja/verifier/issues/18)
16+
* Add `ThrowableVerifier#causedByAll` & `ThrowableVerifier#causedByAny` [#19](https://github.com/NotNinja/verifier/issues/19)
17+
* Add more formatters [#21](https://github.com/NotNinja/verifier/issues/21)
18+
* Add CustomVerifier#and & CustomVerifier#andComparable methods to allow even more fluid chaining [#22](https://github.com/NotNinja/verifier/issues/22)
1419
* Add translations badge to README via [Crowdin](https://crowdin.com)
1520
* Add JavaDoc badge to README via [JavaDoc](https://www.javadoc.io)
1621
* Add code coverage badge to README via [Codecov](https://codecov.io)

CONTRIBUTING.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Contributing
22

3-
If you have any questions about [Verifier](https://github.com/Skelp/verifier) please feel free to
4-
[raise an issue](https://github.com/Skelp/verifier/issues/new).
3+
If you have any questions about [Verifier](https://github.com/NotNinja/verifier) please feel free to
4+
[raise an issue](https://github.com/NotNinja/verifier/issues/new).
55

6-
Please [search existing issues](https://github.com/Skelp/verifier/issues) for the same feature and/or issue before
6+
Please [search existing issues](https://github.com/NotNinja/verifier/issues) for the same feature and/or issue before
77
raising a new issue. Commenting on an existing issue is usually preferred over raising duplicate issues.
88

99
Please ensure that all files conform to the coding standards, using the same coding style as the rest of the code base.
@@ -16,5 +16,6 @@ $ mvn clean install
1616
All pull requests should be made to the `develop` branch.
1717

1818
Don't forget to add your details to the list of
19-
[AUTHORS.md](https://github.com/Skelp/verifier/blob/master/AUTHORS.md) if you want your contribution to be recognized by
20-
others. We will try to make sure that the `contributors` node within the POM is updated on each release to reflect this.
19+
[AUTHORS.md](https://github.com/NotNinja/verifier/blob/master/AUTHORS.md) if you want your contribution to be recognized
20+
by others. We will try to make sure that the `contributors` node within the POM is updated on each release to reflect
21+
this.

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2017 Alasdair Mercer, Skelp
1+
Copyright (C) 2017 Alasdair Mercer, !ninja
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# Verifier
22

3-
[Verifier](https://github.com/Skelp/verifier) is a Java library for validation which concentrates on providing a simple
4-
API with useful (and readable!) error messages, all while being highly configurable so that it's useful in your
3+
[Verifier](https://github.com/NotNinja/verifier) is a Java library for validation which concentrates on providing a
4+
simple API with useful (and readable!) error messages, all while being highly configurable so that it's useful in your
55
application code.
66

7-
[![Chat](https://img.shields.io/gitter/room/skelpuk/verifier.svg)](https://gitter.im/skelpuk/verifier)
8-
[![Build](https://img.shields.io/travis/Skelp/verifier/develop.svg)](https://travis-ci.org/Skelp/verifier)
9-
[![Coverage](https://img.shields.io/codecov/c/github/Skelp/verifier/develop.svg)](https://codecov.io/gh/Skelp/verifier)
7+
[![Build](https://img.shields.io/travis/NotNinja/verifier/develop.svg)](https://travis-ci.org/NotNinja/verifier)
8+
[![Coverage](https://img.shields.io/codecov/c/github/NotNinja/verifier/develop.svg)](https://codecov.io/gh/NotNinja/verifier)
109
[![Translations](https://d322cqt584bo4o.cloudfront.net/verifier/localized.svg)](https://crowdin.com/project/verifier)
11-
[![JavaDoc](https://www.javadoc.io/badge/io.skelp/verifier.svg)](https://www.javadoc.io/doc/io.skelp/verifier)
12-
[![License](https://img.shields.io/github/license/Skelp/verifier.svg)](https://github.com/Skelp/verifier/blob/master/LICENSE.md)
13-
[![Maven Central](https://img.shields.io/maven-central/v/io.skelp/verifier.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.skelp%22%20AND%20a%3A%22verifier%22)
10+
[![JavaDoc](https://www.javadoc.io/badge/org.notninja/verifier.svg)](https://www.javadoc.io/doc/org.notninja/verifier)
11+
[![License](https://img.shields.io/github/license/NotNinja/verifier.svg)](https://github.com/NotNinja/verifier/blob/master/LICENSE.md)
12+
[![Maven Central](https://img.shields.io/maven-central/v/org.notninja/verifier.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.notninja%22%20AND%20a%3A%22verifier%22)
1413

1514
* [Install](#install)
1615
* [API](#api)
@@ -25,15 +24,15 @@ To install Verifier, simply add it as a dependency to your project:
2524
**Maven:**
2625
``` xml
2726
<dependency>
28-
<groupId>io.skelp</groupId>
27+
<groupId>org.notninja</groupId>
2928
<artifactId>verifier</artifactId>
30-
<version>0.2.0</version>
29+
<version>0.3.0</version>
3130
</dependency>
3231
```
3332

34-
**Grails:**
33+
**Gradle:**
3534
``` groovy
36-
compile 'io.skelp:verifier:0.2.0'
35+
compile 'org.notninja:verifier:0.3.0'
3736
```
3837

3938
That's it! You'll need to have Java 8 or above though.
@@ -45,7 +44,7 @@ Verifier offers validation methods for a lot of standard Java data types:
4544
``` java
4645
package com.example.form;
4746

48-
import io.skelp.verifier.Verifier;
47+
import org.notninja.verifier.Verifier;
4948

5049
public class LoginForm implements Form {
5150

@@ -74,7 +73,7 @@ package com.example.form;
7473

7574
import com.example.verifier.PasswordVerifier;
7675

77-
import io.skelp.verifier.Verifier;
76+
import org.notninja.verifier.Verifier;
7877

7978
public class RegistrationForm implements Form {
8079

@@ -129,19 +128,18 @@ If a data type is missing that you'd like to see supported by Verifier, please t
129128
## Bugs
130129

131130
If you have any problems with Verifier or would like to see changes currently in development you can do so
132-
[here](https://github.com/Skelp/verifier/issues).
131+
[here](https://github.com/NotNinja/verifier/issues).
133132

134133
## Contributors
135134

136135
If you want to contribute, you're a legend! Information on how you can do so can be found in
137-
[CONTRIBUTING.md](https://github.com/Skelp/verifier/blob/master/CONTRIBUTING.md). We want your suggestions and pull
136+
[CONTRIBUTING.md](https://github.com/NotNinja/verifier/blob/master/CONTRIBUTING.md). We want your suggestions and pull
138137
requests!
139138

140-
A list of Verifier contributors can be found in [AUTHORS.md](https://github.com/Skelp/verifier/blob/master/AUTHORS.md).
139+
A list of Verifier contributors can be found in[AUTHORS.md](https://github.com/NotNinja/verifier/blob/master/AUTHORS.md).
141140

142141
## License
143142

144-
See [LICENSE.md](https://github.com/Skelp/verifier/raw/master/LICENSE.md) for more information on our MIT license.
143+
See [LICENSE.md](https://github.com/NotNinja/verifier/raw/master/LICENSE.md) for more information on our MIT license.
145144

146-
© 2017 [Skelp](https://skelp.io)
147-
<img align="right" width="16" height="16" src="https://cdn.rawgit.com/Skelp/skelp-branding/master/assets/logo/base/skelp-logo-16x16.png">
145+
[![Copyright !ninja](https://cdn.rawgit.com/NotNinja/branding/master/assets/copyright/base/not-ninja-copyright-186x25.png)](https://not.ninja)

codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
comment: off

pom.xml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (C) 2017 Alasdair Mercer, Skelp
3+
Copyright (C) 2017 Alasdair Mercer, !ninja
44
55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -27,33 +27,33 @@
2727

2828
<modelVersion>4.0.0</modelVersion>
2929

30-
<groupId>io.skelp</groupId>
30+
<groupId>org.notninja</groupId>
3131
<artifactId>verifier</artifactId>
32-
<version>0.2.0</version>
32+
<version>0.3.0</version>
3333
<name>Verifier</name>
3434
<description>
3535
Verifier is a Java library for validation.
3636
</description>
37-
<url>https://github.com/Skelp/verifier</url>
37+
<url>https://github.com/NotNinja/verifier</url>
3838
<inceptionYear>2016</inceptionYear>
3939

4040
<licenses>
4141
<license>
4242
<name>MIT License</name>
43-
<url>https://github.com/Skelp/verifier/blob/master/LICENSE.md</url>
43+
<url>https://github.com/NotNinja/verifier/blob/master/LICENSE.md</url>
4444
<distribution>repo</distribution>
4545
</license>
4646
</licenses>
4747

4848
<issueManagement>
4949
<system>GitHub Issues</system>
50-
<url>https://github.com/Skelp/verifier/issues</url>
50+
<url>https://github.com/NotNinja/verifier/issues</url>
5151
</issueManagement>
5252

5353
<scm>
54-
<url>https://github.com/Skelp/verifier</url>
55-
<connection>scm:git:git://github.com/Skelp/verifier.git</connection>
56-
<developerConnection>scm:git:git@github.com:Skelp/verifier.git</developerConnection>
54+
<url>https://github.com/NotNinja/verifier</url>
55+
<connection>scm:git:git://github.com/NotNinja/verifier.git</connection>
56+
<developerConnection>scm:git:git@github.com:NotNinja/verifier.git</developerConnection>
5757
</scm>
5858

5959
<distributionManagement>
@@ -71,10 +71,8 @@
7171
<developer>
7272
<id>neocotic</id>
7373
<name>Alasdair Mercer</name>
74-
<email>alasdair@skelp.io</email>
74+
<email>mercer.alasdair@gmail.com</email>
7575
<url>https://github.com/neocotic</url>
76-
<organization>Skelp</organization>
77-
<organizationUrl>https://skelp.io</organizationUrl>
7876
<timezone>Europe/London</timezone>
7977
</developer>
8078
</developers>
@@ -118,12 +116,12 @@
118116
<plugin>
119117
<groupId>org.apache.maven.plugins</groupId>
120118
<artifactId>maven-surefire-plugin</artifactId>
121-
<version>2.19.1</version>
119+
<version>2.20.1</version>
122120
</plugin>
123121
<plugin>
124122
<groupId>org.jacoco</groupId>
125123
<artifactId>jacoco-maven-plugin</artifactId>
126-
<version>0.7.7.201606060606</version>
124+
<version>0.7.9</version>
127125
<executions>
128126
<execution>
129127
<id>jacoco-initialize</id>
@@ -133,7 +131,7 @@
133131
</execution>
134132
<execution>
135133
<id>jacoco-site</id>
136-
<phase>package</phase>
134+
<phase>test</phase>
137135
<goals>
138136
<goal>report</goal>
139137
</goals>
@@ -246,7 +244,7 @@
246244
<plugin>
247245
<groupId>org.sonatype.plugins</groupId>
248246
<artifactId>nexus-staging-maven-plugin</artifactId>
249-
<version>1.6.7</version>
247+
<version>1.6.8</version>
250248
<extensions>true</extensions>
251249
<configuration>
252250
<serverId>ossrh</serverId>

src/main/java/io/skelp/verifier/AbstractCustomVerifier.java renamed to src/main/java/org/notninja/verifier/AbstractCustomVerifier.java

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2017 Alasdair Mercer, Skelp
2+
* Copyright (C) 2017 Alasdair Mercer, !ninja
33
*
44
* Permission is hereby granted, free of charge, to any person obtaining a copy
55
* of this software and associated documentation files (the "Software"), to deal
@@ -19,7 +19,7 @@
1919
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2020
* SOFTWARE.
2121
*/
22-
package io.skelp.verifier;
22+
package org.notninja.verifier;
2323

2424
import java.math.BigDecimal;
2525
import java.math.BigInteger;
@@ -31,30 +31,30 @@
3131
import java.util.Map;
3232
import java.util.function.Function;
3333

34-
import io.skelp.verifier.message.MessageKey;
35-
import io.skelp.verifier.service.Services;
36-
import io.skelp.verifier.type.ArrayVerifier;
37-
import io.skelp.verifier.type.BigDecimalVerifier;
38-
import io.skelp.verifier.type.BigIntegerVerifier;
39-
import io.skelp.verifier.type.BooleanVerifier;
40-
import io.skelp.verifier.type.ByteVerifier;
41-
import io.skelp.verifier.type.CalendarVerifier;
42-
import io.skelp.verifier.type.CharacterVerifier;
43-
import io.skelp.verifier.type.ClassVerifier;
44-
import io.skelp.verifier.type.CollectionVerifier;
45-
import io.skelp.verifier.type.ComparableVerifier;
46-
import io.skelp.verifier.type.DateVerifier;
47-
import io.skelp.verifier.type.DoubleVerifier;
48-
import io.skelp.verifier.type.FloatVerifier;
49-
import io.skelp.verifier.type.IntegerVerifier;
50-
import io.skelp.verifier.type.LocaleVerifier;
51-
import io.skelp.verifier.type.LongVerifier;
52-
import io.skelp.verifier.type.MapVerifier;
53-
import io.skelp.verifier.type.ObjectVerifier;
54-
import io.skelp.verifier.type.ShortVerifier;
55-
import io.skelp.verifier.type.StringVerifier;
56-
import io.skelp.verifier.type.ThrowableVerifier;
57-
import io.skelp.verifier.verification.Verification;
34+
import org.notninja.verifier.message.MessageKey;
35+
import org.notninja.verifier.service.Services;
36+
import org.notninja.verifier.type.ArrayVerifier;
37+
import org.notninja.verifier.type.BigDecimalVerifier;
38+
import org.notninja.verifier.type.BigIntegerVerifier;
39+
import org.notninja.verifier.type.BooleanVerifier;
40+
import org.notninja.verifier.type.ByteVerifier;
41+
import org.notninja.verifier.type.CalendarVerifier;
42+
import org.notninja.verifier.type.CharacterVerifier;
43+
import org.notninja.verifier.type.ClassVerifier;
44+
import org.notninja.verifier.type.CollectionVerifier;
45+
import org.notninja.verifier.type.ComparableVerifier;
46+
import org.notninja.verifier.type.DateVerifier;
47+
import org.notninja.verifier.type.DoubleVerifier;
48+
import org.notninja.verifier.type.FloatVerifier;
49+
import org.notninja.verifier.type.IntegerVerifier;
50+
import org.notninja.verifier.type.LocaleVerifier;
51+
import org.notninja.verifier.type.LongVerifier;
52+
import org.notninja.verifier.type.MapVerifier;
53+
import org.notninja.verifier.type.ObjectVerifier;
54+
import org.notninja.verifier.type.ShortVerifier;
55+
import org.notninja.verifier.type.StringVerifier;
56+
import org.notninja.verifier.type.ThrowableVerifier;
57+
import org.notninja.verifier.verification.Verification;
5858

5959
/**
6060
* <p>
@@ -597,15 +597,15 @@ public Verification<T> verification() {
597597
*/
598598
public enum MessageKeys implements MessageKey {
599599

600-
EQUAL_TO("io.skelp.verifier.AbstractCustomVerifier.equalTo"),
601-
EQUAL_TO_ANY("io.skelp.verifier.AbstractCustomVerifier.equalToAny"),
602-
HASHED_AS("io.skelp.verifier.AbstractCustomVerifier.hashedAs"),
603-
INSTANCE_OF("io.skelp.verifier.AbstractCustomVerifier.instanceOf"),
604-
INSTANCE_OF_ALL("io.skelp.verifier.AbstractCustomVerifier.instanceOfAll"),
605-
INSTANCE_OF_ANY("io.skelp.verifier.AbstractCustomVerifier.instanceOfAny"),
606-
NULLED("io.skelp.verifier.AbstractCustomVerifier.nulled"),
607-
SAME_AS("io.skelp.verifier.AbstractCustomVerifier.sameAs"),
608-
SAME_AS_ANY("io.skelp.verifier.AbstractCustomVerifier.sameAsAny");
600+
EQUAL_TO("org.notninja.verifier.AbstractCustomVerifier.equalTo"),
601+
EQUAL_TO_ANY("org.notninja.verifier.AbstractCustomVerifier.equalToAny"),
602+
HASHED_AS("org.notninja.verifier.AbstractCustomVerifier.hashedAs"),
603+
INSTANCE_OF("org.notninja.verifier.AbstractCustomVerifier.instanceOf"),
604+
INSTANCE_OF_ALL("org.notninja.verifier.AbstractCustomVerifier.instanceOfAll"),
605+
INSTANCE_OF_ANY("org.notninja.verifier.AbstractCustomVerifier.instanceOfAny"),
606+
NULLED("org.notninja.verifier.AbstractCustomVerifier.nulled"),
607+
SAME_AS("org.notninja.verifier.AbstractCustomVerifier.sameAs"),
608+
SAME_AS_ANY("org.notninja.verifier.AbstractCustomVerifier.sameAsAny");
609609

610610
private final String code;
611611

0 commit comments

Comments
 (0)