Skip to content

Commit

Permalink
Merge branch '__rultor'
Browse files Browse the repository at this point in the history
  • Loading branch information
rultor committed Jun 6, 2017
2 parents 485e6d1 + 768fb1a commit 1fffaa6
Show file tree
Hide file tree
Showing 6 changed files with 334 additions and 0 deletions.
64 changes: 64 additions & 0 deletions src/main/java/org/cactoos/func/UncheckedScalar.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/**
* 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.func;

import java.io.IOException;
import java.io.UncheckedIOException;
import org.cactoos.Scalar;

/**
* Scalar that doesn't throw checked {@link Exception}.
*
* <p>There is no thread-safety guarantee.
*
* @author Fabricio Cabral ([email protected])
* @version $Id$
* @param <T> Type of result
* @since 0.3
*/
public final class UncheckedScalar<T> implements Scalar<T> {

/**
* Original scalar.
*/
private final Scalar<T> scalar;

/**
* Ctor.
* @param scalar Encapsulated scalar
*/
public UncheckedScalar(final Scalar<T> scalar) {
this.scalar = scalar;
}

@Override
public T asValue() {
try {
return this.scalar.asValue();
} catch (final IOException ex) {
throw new UncheckedIOException(ex);
}
}

}
63 changes: 63 additions & 0 deletions src/main/java/org/cactoos/io/UncheckedBytes.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/**
* 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.io;

import java.io.IOException;
import java.io.UncheckedIOException;
import org.cactoos.Bytes;

/**
* Bytes that doesn't throw checked {@link Exception}.
*
* <p>There is no thread-safety guarantee.
*
* @author Fabricio Cabral ([email protected])
* @version $Id$
* @since 0.3
*/
public final class UncheckedBytes implements Bytes {

/**
* Original bytes.
*/
private final Bytes bytes;

/**
* Ctor.
* @param bytes Encapsulated bytes
*/
public UncheckedBytes(final Bytes bytes) {
this.bytes = bytes;
}

@Override
public byte[] asBytes() {
try {
return this.bytes.asBytes();
} catch (final IOException ex) {
throw new UncheckedIOException(ex);
}
}

}
63 changes: 63 additions & 0 deletions src/main/java/org/cactoos/text/UncheckedText.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/**
* 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.text;

import java.io.IOException;
import java.io.UncheckedIOException;
import org.cactoos.Text;

/**
* Text that doesn't throw checked {@link Exception}.
*
* <p>There is no thread-safety guarantee.
*
* @author Fabricio Cabral ([email protected])
* @version $Id$
* @since 0.3
*/
public final class UncheckedText implements Text {

/**
* Original text.
*/
private final Text text;

/**
* Ctor.
* @param text Encapsulated text
*/
public UncheckedText(final Text text) {
this.text = text;
}

@Override
public String asString() {
try {
return this.text.asString();
} catch (final IOException ex) {
throw new UncheckedIOException(ex);
}
}

}
48 changes: 48 additions & 0 deletions src/test/java/org/cactoos/func/UncheckedScalarTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/**
* 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.func;

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

/**
* Test case for {@link UncheckedScalar}.
*
* @author Fabricio Cabral ([email protected])
* @version $Id$
* @since 0.3
* @checkstyle JavadocMethodCheck (500 lines)
*/
public final class UncheckedScalarTest {

@Test(expected = RuntimeException.class)
public void rethrowsCheckedToUncheckedException() {
new UncheckedScalar<>(
() -> {
throw new IOException("intended");
}
).asValue();
}

}
48 changes: 48 additions & 0 deletions src/test/java/org/cactoos/io/UncheckedBytesTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/**
* 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.io;

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

/**
* Test case for {@link UncheckedBytes}.
*
* @author Fabricio Cabral ([email protected])
* @version $Id$
* @since 0.3
* @checkstyle JavadocMethodCheck (500 lines)
*/
public final class UncheckedBytesTest {

@Test(expected = RuntimeException.class)
public void rethrowsCheckedToUncheckedException() {
new UncheckedBytes(
() -> {
throw new IOException("intended");
}
).asBytes();
}

}
48 changes: 48 additions & 0 deletions src/test/java/org/cactoos/text/UncheckedTextTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/**
* 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.text;

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

/**
* Test case for {@link UncheckedText}.
*
* @author Fabricio Cabral ([email protected])
* @version $Id$
* @since 0.3
* @checkstyle JavadocMethodCheck (500 lines)
*/
public final class UncheckedTextTest {

@Test(expected = RuntimeException.class)
public void rethrowsCheckedToUncheckedException() {
new UncheckedText(
() -> {
throw new IOException("intended");
}
).asString();
}

}

0 comments on commit 1fffaa6

Please sign in to comment.