refactoring

Author: raydac

src/main/java/com/igormaznitsa/prologparser/ParserContext.java

@@ -62,28 +62,32 @@ public interface ParserContext {
 
   /**
    * Check that the context contains an operator starts with some string
-   * @param source source prolog parser making request, must not be null
+   *
+   * @param source     source prolog parser making request, must not be null
    * @param namePrefix string to be used to look for operator starts with it, must not be null
    * @return true if there is such operator, false otherwise
    */
   boolean hasOpStartsWith(PrologParser source, String namePrefix);
 
   /**
    * Find operators for their name.
+   *
    * @param source source prolog parser making request, must not be null
-   * @param name name of operators, must not be null
+   * @param name   name of operators, must not be null
    * @return operator container if such one is found, null otherwise
    */
   OpContainer findOpForName(PrologParser source, String name);
 
   /**
    * Find all operators registered in context.
+   *
    * @return map of operators to their names registered in the context, must not be null
    */
   Map<String, OpContainer> findAllOperators();
 
   /**
    * Get maximum allowed length value for internal parser text buffers.
+   *
    * @return maximum allowed text parser buffers length in chars
    */
   default int getMaxTokenizerBufferLength() {
@@ -92,6 +96,7 @@ default int getMaxTokenizerBufferLength() {
 
   /**
    * get parser flags for the parser context.
+   *
    * @return flags as bit field
    * @see ParserContext#FLAG_NONE
    * @see ParserContext#FLAG_VAR_AS_FUNCTOR

src/main/java/com/igormaznitsa/prologparser/PrologParser.java

@@ -60,7 +60,7 @@
 /**
  * Abstract base Prolog parser.
  */
-public abstract class PrologParser implements Iterator<PrologTerm>, Iterable<PrologTerm>, Closeable {
+public abstract class PrologParser implements Iterable<PrologTerm>, Closeable {
 
   public static final PrologTerm[] EMPTY_TERM_ARRAY = new PrologTerm[0];
   protected static final Koi7CharOpMap META_OP_MAP;
@@ -184,7 +184,6 @@ public ParserContext getContext() {
     return context;
   }
 
-  @Override
   public boolean hasNext() {
     if (this.lastFoundTerm == null) {
       final PrologTerm found = readBlock(OPERATORS_PHRASE);
@@ -206,7 +205,6 @@ public boolean hasNext() {
     return this.lastFoundTerm != null;
   }
 
-  @Override
   public PrologTerm next() {
     try {
       if (hasNext()) {
@@ -674,7 +672,7 @@ public PrologTerm next() {
   public Stream<PrologTerm> stream() {
     return StreamSupport.stream(
         Spliterators.spliteratorUnknownSize(
-            this,
+            this.iterator(),
             Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL),
         false
     );

src/main/java/com/igormaznitsa/prologparser/terms/PrologList.java

@@ -110,6 +110,7 @@ public PrologTerm getTermAt(final int index) {
     return result == null ? EMPTY_ANONYMOUS_VAR : result;
   }
 
+  @Override
   public boolean isEmpty() {
     return this.elements[0] == null && this.elements[1] == null;
   }
@@ -167,6 +168,7 @@ public PrologList addAsNewListToEndOfListChain(final PrologTerm term) {
 
   /**
    * Replace last tail element in list chain.
+   *
    * @param newTailElement new element
    */
   public void replaceEndListElement(final PrologTerm newTailElement) {

src/main/java/com/igormaznitsa/prologparser/terms/PrologStruct.java

@@ -134,8 +134,9 @@ public PrologTerm getTermAt(final int index) {
 
   /**
    * Set element for its position.
+   *
    * @param index zero based index
-   * @param term term to set to position
+   * @param term  term to set to position
    * @throws ArrayIndexOutOfBoundsException if wrong index
    */
   public void setElementAt(final int index, final PrologTerm term) {

src/main/java/com/igormaznitsa/prologparser/tokenizer/Tokenizer.java

@@ -258,7 +258,7 @@ private void skipUntilBlockCommentEnd() throws IOException {
     boolean starCharDetected = false;
     while (!Thread.currentThread().isInterrupted()) {
       final int readChar = this.readChar();
-      if (readChar < 0 || readChar == '/' && starCharDetected) {
+      if (readChar < 0 || (readChar == '/' && starCharDetected)) {
         break;
       } else {
         starCharDetected = readChar == '*';

src/test/java/com/igormaznitsa/prologparser/IntegrationTest.java

@@ -1116,7 +1116,7 @@ public void testUnexpectedlyEndedReadStream() {
             new InputStreamReader(
                 new PrologSourceKoi7Generator(rnd.nextBoolean(),
                     numChars,
-                    false)), new DefaultParserContext(FLAG_BLOCK_COMMENTS));
+                    false), StandardCharsets.UTF_8), new DefaultParserContext(FLAG_BLOCK_COMMENTS));
 
         while (parser.hasNext()) {
           assertNotNull(parser.next());