Skip to content

Commit

Permalink
Merge pull request #25 from NotNinja/develop
Browse files Browse the repository at this point in the history
Release 0.3.0
  • Loading branch information
neocotic authored Oct 3, 2017
2 parents 83e60aa + a865615 commit bf9fa59
Show file tree
Hide file tree
Showing 180 changed files with 1,391 additions and 1,222 deletions.
7 changes: 0 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,3 @@ addons:
- oracle-java8-installer
after_success:
- bash <(curl -s https://codecov.io/bash)
notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/a4d2c0b15b94444b173e
on_success: always
on_failure: always
on_start: never
2 changes: 1 addition & 1 deletion AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Authors ordered by first contribution

* Alasdair Mercer <alasdair@skelp.io>
* Alasdair Mercer <mercer.alasdair@gmail.com>
27 changes: 16 additions & 11 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
## Version 0.3.0, 2017.10.03

* ServiceLoaders being loaded multiple times so providers are not being cached [#23](https://github.com/NotNinja/verifier/issues/23)
* Move from `io.skelp:verifier` to `org.notninja:verifier` (**breaking change**)

## Version 0.2.0, 2017.02.11

* Drop support for Java 7 [#9](https://github.com/Skelp/verifier/issues/9) (**breaking change**)
* Support nested arrays and circular references in `DefaultArrayFormatter` [#10](https://github.com/Skelp/verifier/issues/10)
* Support different locales [#11](https://github.com/Skelp/verifier/issues/11) (**breaking change**)
* Support multiple verification reporters [#14](https://github.com/Skelp/verifier/issues/14) (**breaking change**)
* Add `ClassVerifier#assignableFromAll` & `ClassVerifier#assignableFromAny` [#15](https://github.com/Skelp/verifier/issues/15)
* Rename `ClassVerifier#interfacing` to `ClassVerifier#interfaced` [#16](https://github.com/Skelp/verifier/issues/16) (**breaking change**)
* Rename `LocaleVerifier#defaulting` to `LocaleVerifier#defaulted` [#17](https://github.com/Skelp/verifier/issues/17) (**breaking change**)
* Add `StringVerifier#matchAll` & `StringVerifier#matchAny` [#18](https://github.com/Skelp/verifier/issues/18)
* Add `ThrowableVerifier#causedByAll` & `ThrowableVerifier#causedByAny` [#19](https://github.com/Skelp/verifier/issues/19)
* Add more formatters [#21](https://github.com/Skelp/verifier/issues/21)
* Add CustomVerifier#and & CustomVerifier#andComparable methods to allow even more fluid chaining [#22](https://github.com/Skelp/verifier/issues/22)
* Drop support for Java 7 [#9](https://github.com/NotNinja/verifier/issues/9) (**breaking change**)
* Support nested arrays and circular references in `DefaultArrayFormatter` [#10](https://github.com/NotNinja/verifier/issues/10)
* Support different locales [#11](https://github.com/NotNinja/verifier/issues/11) (**breaking change**)
* Support multiple verification reporters [#14](https://github.com/NotNinja/verifier/issues/14) (**breaking change**)
* Add `ClassVerifier#assignableFromAll` & `ClassVerifier#assignableFromAny` [#15](https://github.com/NotNinja/verifier/issues/15)
* Rename `ClassVerifier#interfacing` to `ClassVerifier#interfaced` [#16](https://github.com/NotNinja/verifier/issues/16) (**breaking change**)
* Rename `LocaleVerifier#defaulting` to `LocaleVerifier#defaulted` [#17](https://github.com/NotNinja/verifier/issues/17) (**breaking change**)
* Add `StringVerifier#matchAll` & `StringVerifier#matchAny` [#18](https://github.com/NotNinja/verifier/issues/18)
* Add `ThrowableVerifier#causedByAll` & `ThrowableVerifier#causedByAny` [#19](https://github.com/NotNinja/verifier/issues/19)
* Add more formatters [#21](https://github.com/NotNinja/verifier/issues/21)
* Add CustomVerifier#and & CustomVerifier#andComparable methods to allow even more fluid chaining [#22](https://github.com/NotNinja/verifier/issues/22)
* Add translations badge to README via [Crowdin](https://crowdin.com)
* Add JavaDoc badge to README via [JavaDoc](https://www.javadoc.io)
* Add code coverage badge to README via [Codecov](https://codecov.io)
Expand Down
11 changes: 6 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Contributing

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

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

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

Don't forget to add your details to the list of
[AUTHORS.md](https://github.com/Skelp/verifier/blob/master/AUTHORS.md) if you want your contribution to be recognized by
others. We will try to make sure that the `contributors` node within the POM is updated on each release to reflect this.
[AUTHORS.md](https://github.com/NotNinja/verifier/blob/master/AUTHORS.md) if you want your contribution to be recognized
by others. We will try to make sure that the `contributors` node within the POM is updated on each release to reflect
this.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2017 Alasdair Mercer, Skelp
Copyright (C) 2017 Alasdair Mercer, !ninja

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
38 changes: 18 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
# Verifier

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

[![Chat](https://img.shields.io/gitter/room/skelpuk/verifier.svg)](https://gitter.im/skelpuk/verifier)
[![Build](https://img.shields.io/travis/Skelp/verifier/develop.svg)](https://travis-ci.org/Skelp/verifier)
[![Coverage](https://img.shields.io/codecov/c/github/Skelp/verifier/develop.svg)](https://codecov.io/gh/Skelp/verifier)
[![Build](https://img.shields.io/travis/NotNinja/verifier/develop.svg)](https://travis-ci.org/NotNinja/verifier)
[![Coverage](https://img.shields.io/codecov/c/github/NotNinja/verifier/develop.svg)](https://codecov.io/gh/NotNinja/verifier)
[![Translations](https://d322cqt584bo4o.cloudfront.net/verifier/localized.svg)](https://crowdin.com/project/verifier)
[![JavaDoc](https://www.javadoc.io/badge/io.skelp/verifier.svg)](https://www.javadoc.io/doc/io.skelp/verifier)
[![License](https://img.shields.io/github/license/Skelp/verifier.svg)](https://github.com/Skelp/verifier/blob/master/LICENSE.md)
[![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)
[![JavaDoc](https://www.javadoc.io/badge/org.notninja/verifier.svg)](https://www.javadoc.io/doc/org.notninja/verifier)
[![License](https://img.shields.io/github/license/NotNinja/verifier.svg)](https://github.com/NotNinja/verifier/blob/master/LICENSE.md)
[![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)

* [Install](#install)
* [API](#api)
Expand All @@ -25,15 +24,15 @@ To install Verifier, simply add it as a dependency to your project:
**Maven:**
``` xml
<dependency>
<groupId>io.skelp</groupId>
<groupId>org.notninja</groupId>
<artifactId>verifier</artifactId>
<version>0.2.0</version>
<version>0.3.0</version>
</dependency>
```

**Grails:**
**Gradle:**
``` groovy
compile 'io.skelp:verifier:0.2.0'
compile 'org.notninja:verifier:0.3.0'
```

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

import io.skelp.verifier.Verifier;
import org.notninja.verifier.Verifier;

public class LoginForm implements Form {

Expand Down Expand Up @@ -74,7 +73,7 @@ package com.example.form;

import com.example.verifier.PasswordVerifier;

import io.skelp.verifier.Verifier;
import org.notninja.verifier.Verifier;

public class RegistrationForm implements Form {

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

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

## Contributors

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

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

## License

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

© 2017 [Skelp](https://skelp.io)
<img align="right" width="16" height="16" src="https://cdn.rawgit.com/Skelp/skelp-branding/master/assets/logo/base/skelp-logo-16x16.png">
[![Copyright !ninja](https://cdn.rawgit.com/NotNinja/branding/master/assets/copyright/base/not-ninja-copyright-186x25.png)](https://not.ninja)
1 change: 1 addition & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
comment: off
30 changes: 14 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2017 Alasdair Mercer, Skelp
Copyright (C) 2017 Alasdair Mercer, !ninja
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -27,33 +27,33 @@

<modelVersion>4.0.0</modelVersion>

<groupId>io.skelp</groupId>
<groupId>org.notninja</groupId>
<artifactId>verifier</artifactId>
<version>0.2.0</version>
<version>0.3.0</version>
<name>Verifier</name>
<description>
Verifier is a Java library for validation.
</description>
<url>https://github.com/Skelp/verifier</url>
<url>https://github.com/NotNinja/verifier</url>
<inceptionYear>2016</inceptionYear>

<licenses>
<license>
<name>MIT License</name>
<url>https://github.com/Skelp/verifier/blob/master/LICENSE.md</url>
<url>https://github.com/NotNinja/verifier/blob/master/LICENSE.md</url>
<distribution>repo</distribution>
</license>
</licenses>

<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/Skelp/verifier/issues</url>
<url>https://github.com/NotNinja/verifier/issues</url>
</issueManagement>

<scm>
<url>https://github.com/Skelp/verifier</url>
<connection>scm:git:git://github.com/Skelp/verifier.git</connection>
<developerConnection>scm:git:git@github.com:Skelp/verifier.git</developerConnection>
<url>https://github.com/NotNinja/verifier</url>
<connection>scm:git:git://github.com/NotNinja/verifier.git</connection>
<developerConnection>scm:git:git@github.com:NotNinja/verifier.git</developerConnection>
</scm>

<distributionManagement>
Expand All @@ -71,10 +71,8 @@
<developer>
<id>neocotic</id>
<name>Alasdair Mercer</name>
<email>alasdair@skelp.io</email>
<email>mercer.alasdair@gmail.com</email>
<url>https://github.com/neocotic</url>
<organization>Skelp</organization>
<organizationUrl>https://skelp.io</organizationUrl>
<timezone>Europe/London</timezone>
</developer>
</developers>
Expand Down Expand Up @@ -118,12 +116,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>2.20.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.7.201606060606</version>
<version>0.7.9</version>
<executions>
<execution>
<id>jacoco-initialize</id>
Expand All @@ -133,7 +131,7 @@
</execution>
<execution>
<id>jacoco-site</id>
<phase>package</phase>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
Expand Down Expand Up @@ -246,7 +244,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017 Alasdair Mercer, Skelp
* Copyright (C) 2017 Alasdair Mercer, !ninja
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,7 +19,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package io.skelp.verifier;
package org.notninja.verifier;

import java.math.BigDecimal;
import java.math.BigInteger;
Expand All @@ -31,30 +31,30 @@
import java.util.Map;
import java.util.function.Function;

import io.skelp.verifier.message.MessageKey;
import io.skelp.verifier.service.Services;
import io.skelp.verifier.type.ArrayVerifier;
import io.skelp.verifier.type.BigDecimalVerifier;
import io.skelp.verifier.type.BigIntegerVerifier;
import io.skelp.verifier.type.BooleanVerifier;
import io.skelp.verifier.type.ByteVerifier;
import io.skelp.verifier.type.CalendarVerifier;
import io.skelp.verifier.type.CharacterVerifier;
import io.skelp.verifier.type.ClassVerifier;
import io.skelp.verifier.type.CollectionVerifier;
import io.skelp.verifier.type.ComparableVerifier;
import io.skelp.verifier.type.DateVerifier;
import io.skelp.verifier.type.DoubleVerifier;
import io.skelp.verifier.type.FloatVerifier;
import io.skelp.verifier.type.IntegerVerifier;
import io.skelp.verifier.type.LocaleVerifier;
import io.skelp.verifier.type.LongVerifier;
import io.skelp.verifier.type.MapVerifier;
import io.skelp.verifier.type.ObjectVerifier;
import io.skelp.verifier.type.ShortVerifier;
import io.skelp.verifier.type.StringVerifier;
import io.skelp.verifier.type.ThrowableVerifier;
import io.skelp.verifier.verification.Verification;
import org.notninja.verifier.message.MessageKey;
import org.notninja.verifier.service.Services;
import org.notninja.verifier.type.ArrayVerifier;
import org.notninja.verifier.type.BigDecimalVerifier;
import org.notninja.verifier.type.BigIntegerVerifier;
import org.notninja.verifier.type.BooleanVerifier;
import org.notninja.verifier.type.ByteVerifier;
import org.notninja.verifier.type.CalendarVerifier;
import org.notninja.verifier.type.CharacterVerifier;
import org.notninja.verifier.type.ClassVerifier;
import org.notninja.verifier.type.CollectionVerifier;
import org.notninja.verifier.type.ComparableVerifier;
import org.notninja.verifier.type.DateVerifier;
import org.notninja.verifier.type.DoubleVerifier;
import org.notninja.verifier.type.FloatVerifier;
import org.notninja.verifier.type.IntegerVerifier;
import org.notninja.verifier.type.LocaleVerifier;
import org.notninja.verifier.type.LongVerifier;
import org.notninja.verifier.type.MapVerifier;
import org.notninja.verifier.type.ObjectVerifier;
import org.notninja.verifier.type.ShortVerifier;
import org.notninja.verifier.type.StringVerifier;
import org.notninja.verifier.type.ThrowableVerifier;
import org.notninja.verifier.verification.Verification;

/**
* <p>
Expand Down Expand Up @@ -597,15 +597,15 @@ public Verification<T> verification() {
*/
public enum MessageKeys implements MessageKey {

EQUAL_TO("io.skelp.verifier.AbstractCustomVerifier.equalTo"),
EQUAL_TO_ANY("io.skelp.verifier.AbstractCustomVerifier.equalToAny"),
HASHED_AS("io.skelp.verifier.AbstractCustomVerifier.hashedAs"),
INSTANCE_OF("io.skelp.verifier.AbstractCustomVerifier.instanceOf"),
INSTANCE_OF_ALL("io.skelp.verifier.AbstractCustomVerifier.instanceOfAll"),
INSTANCE_OF_ANY("io.skelp.verifier.AbstractCustomVerifier.instanceOfAny"),
NULLED("io.skelp.verifier.AbstractCustomVerifier.nulled"),
SAME_AS("io.skelp.verifier.AbstractCustomVerifier.sameAs"),
SAME_AS_ANY("io.skelp.verifier.AbstractCustomVerifier.sameAsAny");
EQUAL_TO("org.notninja.verifier.AbstractCustomVerifier.equalTo"),
EQUAL_TO_ANY("org.notninja.verifier.AbstractCustomVerifier.equalToAny"),
HASHED_AS("org.notninja.verifier.AbstractCustomVerifier.hashedAs"),
INSTANCE_OF("org.notninja.verifier.AbstractCustomVerifier.instanceOf"),
INSTANCE_OF_ALL("org.notninja.verifier.AbstractCustomVerifier.instanceOfAll"),
INSTANCE_OF_ANY("org.notninja.verifier.AbstractCustomVerifier.instanceOfAny"),
NULLED("org.notninja.verifier.AbstractCustomVerifier.nulled"),
SAME_AS("org.notninja.verifier.AbstractCustomVerifier.sameAs"),
SAME_AS_ANY("org.notninja.verifier.AbstractCustomVerifier.sameAsAny");

private final String code;

Expand Down
Loading

0 comments on commit bf9fa59

Please sign in to comment.