.github/workflows/maven.yml

@@ -1,24 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Java CI with Maven
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml

README.md

@@ -6,11 +6,11 @@ This project provides a Java client to manipulate Mikrotik routers using the rem
 
 ## Versions
 
-![Java CI with Maven](https://github.com/GideonLeGrange/mikrotik-java/workflows/Java%20CI%20with%20Maven/badge.svg)
+[![Build Status](https://travis-ci.org/GideonLeGrange/mikrotik-java.svg?branch=master)](https://travis-ci.org/GideonLeGrange/mikrotik-java)
 
-**The current stable version is 3.0.8**
+**The current stable version is 3.0.7**
 
-Version 3.0.8 fixes a null pointer error 
+Version 3.0.7 fixes nested expressions when constructing complex queries using `and` and `or` expressions. See [#72](https://github.com/GideonLeGrange/mikrotik-java/issues/72) for more information
 
 ### Changes in version 3.0:
 
@@ -35,7 +35,7 @@ Maven users can use the artifact from Maven Central with this dependency:
 <dependency>
   <groupId>me.legrange</groupId>
   <artifactId>mikrotik</artifactId>
-  <version>3.0.8</version>
+  <version>3.0.7</version>
 </dependency>
 ```
 

pom.xml

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>  
   <groupId>me.legrange</groupId>  
   <artifactId>mikrotik</artifactId>  
-  <version>3.0.8.1</version>  
+  <version>3.0.7</version>  
   <packaging>jar</packaging>  
   <name>Mikrotik API Java Client Library</name>  
   <url>https://github.com/GideonLeGrange/mikrotik-java</url>  
@@ -33,8 +33,8 @@
         <version>2.3.2</version>  
         <configuration> 
           <showDeprecation>true</showDeprecation>  
-          <source>8</source>  
+          <source>1.7</source>  
-          <target>8</target> 
+          <target>1.7</target> 
         </configuration> 
       </plugin>  
       <plugin> 
@@ -73,7 +73,7 @@
       <plugin> 
         <groupId>org.apache.maven.plugins</groupId>  
         <artifactId>maven-javadoc-plugin</artifactId>  
-        <version>3.7.0</version>  
+        <version>2.9.1</version>  
         <configuration> 
           <excludePackageNames>example;*.impl</excludePackageNames> 
         </configuration>  
@@ -161,7 +161,7 @@
     <dependency> 
       <groupId>junit</groupId>  
       <artifactId>junit</artifactId>  
-      <version>4.13.1</version>  
+      <version>3.8.1</version>  
       <scope>test</scope> 
     </dependency>  
   </dependencies> 

src/main/java/examples/Config.java

@@ -7,8 +7,8 @@ package examples;
  */
 public class Config {
 
-    public static final String HOST = "ce2.ter.cpt.adept.za.net";
+    public static final String HOST = "192.168.1.25";
-    public static final String USERNAME = "adept";
+    public static final String USERNAME = "admin";
-    public static final String PASSWORD = "34ffp9";
+    public static final String PASSWORD = "";
 
 }

src/main/java/examples/ScriptCommand.java

@@ -1,28 +0,0 @@
-package examples;
-
-import me.legrange.mikrotik.MikrotikApiException;
-
-/**
- * Example 1: A very simple command: Reboot the remote router
- * @author gideon
- */
-public class ScriptCommand extends Example {
-    
-        public static void main(String...args) throws Exception {
-            ScriptCommand ex = new ScriptCommand();
-            ex.connect();
-            ex.test();
-            ex.disconnect();
-        }
-        
-        private void test() throws MikrotikApiException {
-            con.execute("/ip/hotspot/user/profile/add name=\"cahyo-cek-2\" idle-timeout=none keepalive-timeout=2m status-autorefresh=1m shared-users=1 add-mac-cookie=true mac-cookie-timeout=3d parent-queue=none rate-limit=512k/512k on-login=:put(\",re,3000,12d,3000,,Enable,\")");
-        }
-
-        ///
-    /*
-    /ip/hotspot/user/profile/add name="cahyo-cek-2" idle-timeout=none keepalive-timeout=2m status-autorefresh=1m shared-users=1 add-mac-cookie=true mac-cookie-timeout=3d parent-queue=none rate-limit=512k/512k on-login=:put (",re,3000,12d,3000,,Enable,");
-    /system scheduler add name="usercahyo-cek-2-$user" interval=12:00:00 on-even="/ip hotspot active remove [find user=\"$user\"] ; /ip hotspot user set \"$user\" disable=yes ; /system scheduler remove [find name=usercahyo-cek-2-$user]"
-*/
-   
-}

src/main/java/me/legrange/mikrotik/impl/ApiConnectionImpl.java

@@ -14,7 +14,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicInteger;
 import javax.net.SocketFactory;
 import me.legrange.mikrotik.ApiConnection;
 import me.legrange.mikrotik.ApiConnectionException;
@@ -163,7 +162,8 @@ public final class ApiConnectionImpl extends ApiConnection {
     }
 
     private synchronized String nextTag() {
-        return Integer.toHexString(_tag.incrementAndGet());
+        _tag++;
+        return Integer.toHexString(_tag);
     }
 
     private Socket sock = null;
@@ -173,7 +173,7 @@ public final class ApiConnectionImpl extends ApiConnection {
     private Reader reader;
     private Processor processor;
     private final Map<String, ResultListener> listeners;
-    private final AtomicInteger _tag = new AtomicInteger(0);
+    private Integer _tag = 0;
     private int timeout = ApiConnection.DEFAULT_COMMAND_TIMEOUT;
 
     /**
@@ -186,7 +186,7 @@ public final class ApiConnectionImpl extends ApiConnection {
         }
 
         private String take() throws ApiConnectionException, ApiDataException {
-            Object val;
+            Object val = null;
             try {
                 val = queue.take();
             } catch (InterruptedException ex) {
@@ -223,7 +223,7 @@ public final class ApiConnectionImpl extends ApiConnection {
         private void put(Object data) {
             try {
                 queue.put(data);
-            } catch (InterruptedException ignored) {
+            } catch (InterruptedException ex) {
             }
         }
 
@@ -255,24 +255,20 @@ public final class ApiConnectionImpl extends ApiConnection {
                 } catch (MikrotikApiException ex) {
                     continue;
                 }
-                if (res.getTag() != null) {
+                ResultListener l = listeners.get(res.getTag());
-                    ResultListener l = listeners.get(res.getTag());
+                if (l != null) {
-                    if (l != null) {
+                    if (res instanceof Result) {
-                        if (res instanceof Result) {
+                        l.receive((Result) res);
-                            l.receive((Result) res);
+                    } else if (res instanceof Done) {
-                        } else if (res instanceof Done) {
+                        if (l instanceof SyncListener) {
-                            if (l instanceof SyncListener) {
+                            ((SyncListener) l).completed((Done) res);
-                                ((SyncListener) l).completed((Done) res);
+                        } else {
-                            } else {
+                            l.completed();
-                                l.completed();
-                            }
-                            listeners.remove(res.getTag());
-                        } else if (res instanceof Error) {
-                            l.error(new ApiCommandException((Error) res));
                         }
+                        listeners.remove(res.getTag());
+                    } else if (res instanceof Error) {
+                        l.error(new ApiCommandException((Error) res));
                     }
-                } else {
-                    nextTag();
                 }
             }
         }
@@ -280,7 +276,7 @@ public final class ApiConnectionImpl extends ApiConnection {
         private void nextLine() throws ApiConnectionException, ApiDataException {
             if (lines.isEmpty()) {
                 String block = reader.take();
-                String[] parts = block.split("\n");
+                String parts[] = block.split("\n");
                 lines.addAll(Arrays.asList(parts));
             }
             line = lines.remove(0);
@@ -293,7 +289,7 @@ public final class ApiConnectionImpl extends ApiConnection {
         private String peekLine() throws ApiConnectionException, ApiDataException {
             if (lines.isEmpty()) {
                 String block = reader.take();
-                String[] parts = block.split("\n");
+                String parts[] = block.split("\n");
                 lines.addAll(Arrays.asList(parts));
             }
             return lines.get(0);
@@ -306,10 +302,10 @@ public final class ApiConnectionImpl extends ApiConnection {
             switch (line) {
                 case "!re":
                     return unpackRe();
-                case "!empty":
                 case "!done":
                     return unpackDone();
                 case "!trap":
+                    return unpackError();
                 case "!halt":
                     return unpackError();
                 case "":
@@ -320,10 +316,12 @@ public final class ApiConnectionImpl extends ApiConnection {
 
         private Result unpackRe() throws ApiDataException, ApiConnectionException {
             nextLine();
+            int l = 0;
             Result res = new Result();
             while (!line.startsWith(("!"))) {
+                l++;
                 if (line.startsWith(("="))) {
-                    String[] parts = line.split("=", 3);
+                    String parts[] = line.split("=", 3);
                     if (parts.length == 3) {
                         if (!parts[2].endsWith("\r")) {
                             res.put(parts[1], unpackResult(parts[2]));
@@ -340,7 +338,7 @@ public final class ApiConnectionImpl extends ApiConnection {
                         throw new ApiDataException(String.format("Malformed line '%s'", line));
                     }
                 } else if (line.startsWith(".tag=")) {
-                    String[] parts = line.split("=", 2);
+                    String parts[] = line.split("=", 2);
                     if (parts.length == 2) {
                         res.setTag(parts[1]);
                     }
@@ -381,12 +379,12 @@ public final class ApiConnectionImpl extends ApiConnection {
 
                 while (!line.startsWith("!")) {
                     if (line.startsWith(".tag=")) {
-                        String[] parts = line.split("=", 2);
+                        String parts[] = line.split("=", 2);
                         if (parts.length == 2) {
                             done.setTag(parts[1]);
                         }
                     } else if (line.startsWith(("=ret"))) {
-                        String[] parts = line.split("=", 3);
+                        String parts[] = line.split("=", 3);
                         if (parts.length == 3) {
                             done.setHash(parts[2]);
                         } else {
@@ -410,7 +408,7 @@ public final class ApiConnectionImpl extends ApiConnection {
             if (hasNextLine()) {
                 while (!line.startsWith("!")) {
                     if (line.startsWith(".tag=")) {
-                        String[] parts = line.split("=", 2);
+                        String parts[] = line.split("=", 2);
                         if (parts.length == 2) {
                             err.setTag(parts[1]);
                         }