Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed Jul 9, 2017
2 parents 0826ae0 + 265c85b commit 0834245
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 0 deletions.
35 changes: 35 additions & 0 deletions src/main/java/org/cactoos/Bytes.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,39 @@ public interface Bytes {
*/
byte[] asBytes() throws IOException;

/**
* Bytes check for no nulls.
*
* @author Fabricio Cabral (fabriciofx@gmail.com)
* @version $Id$
* @since 0.11
*/
final class NoNulls implements Bytes {
/**
* The input.
*/
private final Bytes origin;
/**
* Ctor.
* @param bytes The input
*/
public NoNulls(final Bytes bytes) {
this.origin = bytes;
}
@Override
public byte[] asBytes() throws IOException {
if (this.origin == null) {
throw new IllegalArgumentException(
"NULL instead of a valid bytes"
);
}
final byte[] bytes = this.origin.asBytes();
if (bytes == null) {
throw new IllegalStateException(
"NULL instead of a valid byte array"
);
}
return bytes;
}
}
}
52 changes: 52 additions & 0 deletions src/test/java/org/cactoos/BytesTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/**
* The MIT License (MIT)
*
* Copyright (c) 2017 Yegor Bugayenko
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.cactoos;

import java.io.IOException;
import org.junit.Test;

/**
* Test case for {@link Bytes.NoNulls}.
* @author Fabricio Cabral (fabriciofx@gmail.com)
* @version $Id$
* @since 0.11
* @checkstyle JavadocMethodCheck (500 lines)
*/
public final class BytesTest {

@Test(expected = IllegalArgumentException.class)
public void failForNullArgument() throws IOException {
new Bytes.NoNulls(null).asBytes();
}

@Test(expected = IllegalStateException.class)
public void failForNullResult() throws IOException {
new Bytes.NoNulls(() -> null).asBytes();
}

@Test
public void okForNoNulls() throws IOException {
new Bytes.NoNulls(() -> new byte[1]).asBytes();
}
}

0 comments on commit 0834245

Please sign in to comment.