Skip to content

Commit 813a3dd

Browse files
dgroupdgroup
committed
#78: Move the corresponding interfaces (like Arg) to their packages
1 parent ae33ebe commit 813a3dd

Some content is hidden

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

55 files changed

+330
-99
lines changed

‎readme.md‎

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ Java version required: 1.8+.
4040
Interface | Purpose | Implementations / Related
4141
----------------------------|-----------------------------------------------------------------------|-------------------------------------------------
4242
[Arg\<T>](#argt) | Allows to fetch the application arguments | [StringOf](#stringof--textof), [NumberOf](#numberof), [PathOf](), [FileOf](), [EnvOf](#envof), [PropOf](#propof), [Alt](#alt), [Unchecked](), [etc](src/main/java/io/github/dgroup/term4j/arg/) |
43-
[Std](#std) | Wrap the raw manipulation with `std out` | [StdOf](#stdof), [Inmem](), [etc](src/main/java/io/github/dgroup/term4j/std)
43+
[Input](#stdin) | Wrap the raw manipulation with `std in` | [StdOf](#stdof), [Inmem](), [etc](src/main/java/io/github/dgroup/term4j/std)
44+
[Output](#stdout) | Wrap the raw manipulation with `std out` | [StdOf](#stdof), [Inmem](), [etc](src/main/java/io/github/dgroup/term4j/std)
4445
[Highlighted](#highlighted) | The colored extension of [Text](https://goo.gl/2ZYC83) for `std out` | [Green](src/main/java/io/github/dgroup/term4j/highlighted/Green.java), [Red](src/main/java/io/github/dgroup/term4j/highlighted/Red.java), [Yellow](src/main/java/io/github/dgroup/term4j/highlighted/Yellow.java), [etc](src/main/java/io/github/dgroup/term4j/highlighted)
4546
[Runtime](#runtimeof) | Wrap the raw manipulation with JVM runtime | [RuntimeOf](src/main/java/io/github/dgroup/term4j/runtime/RuntimeOf.java), [FakeRuntime](src/main/java/io/github/dgroup/term4j/runtime/FakeRuntime.java), [AppException](src/main/java/io/github/dgroup/term4j/runtime/AppException.java), [Stacktrace](src/main/java/io/github/dgroup/term4j/runtime/Stacktrace.java), [etc](src/main/java/io/github/dgroup/term4j/runtime)
4647

@@ -49,7 +50,7 @@ All examples below are using the following frameworks/libs:
4950
- [cactoos](https://github.com/yegor256/cactoos) - Object-Oriented Java primitives, as an alternative to Google Guava and Apache Commons.
5051
- [cactoos-matchers](https://github.com/yegor256/cactoos) - Object-Oriented Hamcrest matchers
5152

52-
### [Arg\<T>](src/main/java/io/github/dgroup/term4j/Arg.java)
53+
### [Arg\<T>](src/main/java/io/github/dgroup/term4j/arg/Arg.java)
5354
#### [StringOf](src/main/java/io/github/dgroup/term4j/arg/StringOf.java) / [TextOf](src/main/java/io/github/dgroup/term4j/arg/TextOf.java)
5455
Fetch the string/[Text](https://goo.gl/2ZYC83) argument:
5556
```bash
@@ -158,8 +159,37 @@ public static void main(String[] cargs) {
158159
);
159160
}
160161
```
161-
### [Std](src/main/java/io/github/dgroup/term4j/Std.java)
162-
#### [StdOf](src/main/java/io/github/dgroup/term4j/std/StdOf.java)
162+
### [Input](src/main/java/io/github/dgroup/term4j/std/input/Input.java)
163+
#### [Stdin](src/main/java/io/github/dgroup/term4j/std/input/Stdin.java)
164+
Wrap the std out, for example for unit testing purposes:
165+
```java
166+
/**
167+
* Simulate the STD input procedure.
168+
*/
169+
@Test
170+
public void readFromStdin() {
171+
/**
172+
* The standard system input (stdin) which keeps the expected input lines in-memory
173+
* instead of direct manipulations with {@link System#in} or {@link Console}.
174+
*/
175+
final Input stdin = new Stdin(
176+
new InputOf(String.format("line1%nline2"))
177+
);
178+
MatcherAssert.assertThat(
179+
"The 1st line was read from console",
180+
stdin.value(),
181+
new IsEqual("line1")
182+
);
183+
MatcherAssert.assertThat(
184+
"The 2nd line was read from console",
185+
stdin.value(),
186+
new IsEqual("line2")
187+
);
188+
}
189+
```
190+
191+
### [Output](src/main/java/io/github/dgroup/term4j/std/output/Output.java)
192+
#### [Stdout](src/main/java/io/github/dgroup/term4j/std/output/Stdout.java)
163193
Wrap the std out, for example for unit testing purposes:
164194
```java
165195
/**
@@ -169,7 +199,7 @@ Wrap the std out, for example for unit testing purposes:
169199
public void printToWriter() {
170200
// Write 4 lines delimited by `\n` or `\r\n` to the StringWriter
171201
final StringWriter swter = new StringWriter();
172-
final Std std = new StdOf(swter);
202+
final Output std = new Stdout(swter);
173203
std.print("line1", "line2");
174204
std.print("line3", "line4");
175205
// Check that the result string has 4 lines

‎src/main/java/io/github/dgroup/term4j/arg/Alt.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424
package io.github.dgroup.term4j.arg;
2525

26-
import io.github.dgroup.term4j.Arg;
2726
import org.cactoos.Scalar;
2827

2928
/**

src/main/java/io/github/dgroup/term4j/Arg.java renamed to src/main/java/io/github/dgroup/term4j/arg/Arg.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
2222
* OR OTHER DEALINGS IN THE SOFTWARE.
2323
*/
24-
package io.github.dgroup.term4j;
24+
package io.github.dgroup.term4j.arg;
2525

26-
import io.github.dgroup.term4j.arg.ArgNotFoundException;
2726
import org.cactoos.Scalar;
2827

2928
/**

‎src/main/java/io/github/dgroup/term4j/arg/ArgEnvelope.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424
package io.github.dgroup.term4j.arg;
2525

26-
import io.github.dgroup.term4j.Arg;
2726
import io.github.dgroup.term4j.arg.scalar.ArgAt;
2827
import io.github.dgroup.term4j.arg.scalar.ArgIn;
2928
import java.util.List;

‎src/main/java/io/github/dgroup/term4j/arg/ArgOf.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424
package io.github.dgroup.term4j.arg;
2525

26-
import io.github.dgroup.term4j.Arg;
2726
import org.cactoos.Scalar;
2827
import org.cactoos.scalar.True;
2928
import org.cactoos.scalar.Unchecked;

‎src/main/java/io/github/dgroup/term4j/arg/Bool.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
package io.github.dgroup.term4j.arg;
2626

27-
import io.github.dgroup.term4j.Arg;
2827
import java.util.List;
2928

3029
/**

‎src/main/java/io/github/dgroup/term4j/arg/FakeArg.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424
package io.github.dgroup.term4j.arg;
2525

26-
import io.github.dgroup.term4j.Arg;
2726
import org.cactoos.Scalar;
2827
import org.cactoos.scalar.Unchecked;
2928

‎src/main/java/io/github/dgroup/term4j/arg/FileOf.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*/
2424
package io.github.dgroup.term4j.arg;
2525

26-
import io.github.dgroup.term4j.Arg;
2726
import java.io.File;
2827
import java.util.List;
2928
import org.cactoos.Scalar;

‎src/main/java/io/github/dgroup/term4j/arg/FirstIn.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
package io.github.dgroup.term4j.arg;
2626

27-
import io.github.dgroup.term4j.Arg;
2827
import org.cactoos.iterable.IterableOf;
2928

3029
/**

‎src/main/java/io/github/dgroup/term4j/arg/IntOf.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
package io.github.dgroup.term4j.arg;
2626

27-
import io.github.dgroup.term4j.Arg;
2827
import java.util.List;
2928
import org.cactoos.Func;
3029

0 commit comments

Comments
 (0)