/*
 * Copyright 2018, TeamDev. All rights reserved.
 *
 * Redistribution and use in source and/or binary forms, with or without
 * modification, must retain the above copyright notice and the following
 * disclaimer.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package io.spine.net;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static io.spine.net.Patterns.EMAIL_ADDRESS;

/**
 * Utility class for working with {@link EmailAddress}es.
 *
 * @author Alexander Yevsyukov
 */
public final class EmailAddresses {

    /** Prevent instantiation of this utility class. */
    private EmailAddresses() {
    }

    /**
     * Obtains pattern for validating email addresses.
     */
    public static Pattern pattern() {
        return EMAIL_ADDRESS;
    }

    /**
     * Verifies if the passed sequence is a valid email address.
     */
    public static boolean isValid(CharSequence value) {
        Matcher matcher = pattern().matcher(value);
        boolean result = matcher.matches();
        return result;
    }

    /**
     * Creates a new {@code EmailAddress} instance for the passed value.
     *
     * @param value a valid email address
     * @return new {@code EmailAddress} instance
     * @throws IllegalArgumentException if the passed email address is not valid
     */
    public static EmailAddress valueOf(CharSequence value) {
        checkNotNull(value);
        checkArgument(isValid(value));

        EmailAddress result = EmailAddress.newBuilder()
                                          .setValue(value.toString())
                                          .build();
        return result;
    }
}

@@ -2361,25 +2361,9 @@
 ress
-.newBuilder()%0A   
+%0A
     
@@ -2366,34 +2366,46 @@
                 
-  
+.newBuilder()%0A
                 
@@ -2404,21 +2404,16 @@
         
-     
 .setValu
@@ -2436,34 +2436,8 @@
 ())%0A
-                          
     

Improve code layout