Skip to content

Commit

Permalink
Merge pull request #68 from feldoh/update-deps
Browse files Browse the repository at this point in the history 
Upgrade dependencies
  • Loading branch information
@feldoh
feldoh committed Oct 21, 2018
2 parents 6d27c83 + a4bc28b commit 1ad8d4d
Show file tree
Hide file tree
Showing 9 changed files with 108 additions and 102 deletions.
29 changes: 23 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mainClass>net.imagini.jzookeeperedit.fx.MainApp</mainClass>
<slf4j.version>1.7.21</slf4j.version>
<slf4j.version>1.7.25</slf4j.version>
</properties>

<organization>
Expand All @@ -23,12 +23,23 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>2.11.0</version>
<version>4.0.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.13</version>
</dependency>
<dependency>
<groupId>org.controlsfx</groupId>
<artifactId>controlsfx</artifactId>
<version>8.40.12</version>
<version>8.40.14</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -43,7 +54,7 @@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
<version>1.58</version>
<version>1.72</version>
</dependency>
<!-- test dependencies -->
<dependency>
Expand All @@ -55,13 +66,19 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.1.0</version>
<version>2.23.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>co.unruly</groupId>
<artifactId>java-8-matchers</artifactId>
<version>1.1</version>
<version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
<version>2.0.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/imagini/zkcli/CliParameters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,9 @@ public CliParameters(List<String> args, ZkClusterManager clusterManager) {
*/
public CliParameters(String[] args, ZkClusterManager clusterManager) {
this.clusterManager = clusterManager;
argProcessor = new JCommander(this, args);
argProcessor = new JCommander(this);
argProcessor.setProgramName(programName);
argProcessor.parse(args);
blacklist.add("/zookeeper");
}

Expand Down
8 changes: 5 additions & 3 deletions src/test/java/net/imagini/jzookeeperedit/ZkNodeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;

import static org.junit.Assert.*;

@RunWith(MockitoJUnitRunner.class)
public class ZkNodeTest {
private static final String NODE_LABEL = "someNode";

@Rule
public MockitoRule mockito = MockitoJUnit.rule();

@Rule
public ExpectedException expectedException = ExpectedException.none();

Expand Down
19 changes: 7 additions & 12 deletions src/test/java/net/imagini/jzookeeperedit/ZkTreeNodeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,30 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;

import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;

import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.when;

@RunWith(MockitoJUnitRunner.class)
public class ZkTreeNodeTest {
private static final Charset CHARSET = java.nio.charset.StandardCharsets.UTF_8;
private static final String NODE_NAME = "aNode";
private static final String ROOT_PATH = "/";
private static final String VALID_PATH = "/valid/path";
private static final String DATA = "Some very interesting\nDATA!!!!!!!";

private List<String> validPathChildren;

@Rule
public MockitoRule mockito = MockitoJUnit.rule();
@Rule
public ExpectedException expectedException = ExpectedException.none();

Expand All @@ -59,6 +53,7 @@ public class ZkTreeNodeTest {
private GetChildrenBuilder mockGetChildrenBuilder;

private ZkTreeNode unit;
private List<String> validPathChildren;

@Before
public void setup() throws Exception {
Expand Down
33 changes: 14 additions & 19 deletions src/test/java/net/imagini/zkcli/CliParametersTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
package net.imagini.zkcli;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.contains;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import com.beust.jcommander.ParameterException;
import net.imagini.jzookeeperedit.ZkClusterManager;
import org.apache.curator.framework.CuratorFramework;
import org.junit.Rule;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;

import java.io.PrintStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.Optional;

import org.apache.curator.framework.CuratorFramework;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;

import net.imagini.jzookeeperedit.ZkClusterManager;

import com.beust.jcommander.ParameterException;
import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.contains;
import static org.mockito.Mockito.*;

@RunWith(MockitoJUnitRunner.class)
public class CliParametersTest {
@Rule
public MockitoRule mockito = MockitoJUnit.rule();

@Mock
private CuratorFramework mockClient;
@Mock
Expand Down
36 changes: 17 additions & 19 deletions src/test/java/net/imagini/zkcli/ZkCliTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package net.imagini.zkcli;

import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.apache.curator.framework.CuratorFramework;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;

import java.io.PrintStream;
import java.lang.reflect.Field;
Expand All @@ -19,18 +19,16 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;

import org.apache.curator.framework.CuratorFramework;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;

@RunWith(MockitoJUnitRunner.class)
public class ZkCliTest {
@Rule
public MockitoRule mockito = MockitoJUnit.rule();
@Rule
public ExpectedException expectedException = ExpectedException.none();

Expand Down
31 changes: 14 additions & 17 deletions src/test/java/net/imagini/zkcli/ZkDeleteHandlerTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
package net.imagini.zkcli;

import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;

import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.BackgroundVersionable;
import org.apache.curator.framework.api.DeleteBuilder;
import org.apache.curator.framework.api.GetChildrenBuilder;
import org.apache.zookeeper.KeeperException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;

import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;

@RunWith(MockitoJUnitRunner.class)
public class ZkDeleteHandlerTest {
@Rule
public MockitoRule mockito = MockitoJUnit.rule();

@Mock
private CuratorFramework client;
Expand Down
28 changes: 14 additions & 14 deletions src/test/java/net/imagini/zkcli/ZkMetadataHandlerTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
package net.imagini.zkcli;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.util.ArrayList;
import java.util.List;

import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.ExistsBuilder;
import org.apache.curator.framework.api.GetChildrenBuilder;
import org.apache.curator.framework.api.GetDataBuilder;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;

import java.util.ArrayList;
import java.util.List;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;

@RunWith(MockitoJUnitRunner.class)
public class ZkMetadataHandlerTest {
@Rule
public MockitoRule mockito = MockitoJUnit.rule();

@Mock
private CuratorFramework client;

Expand Down
23 changes: 12 additions & 11 deletions src/test/java/net/imagini/zkcli/ZkReadHandlerTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
package net.imagini.zkcli;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;

import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;

import co.unruly.matchers.StreamMatchers;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.ExistsBuilder;
import org.apache.curator.framework.api.GetChildrenBuilder;
import org.apache.curator.framework.api.GetDataBuilder;
import org.apache.zookeeper.KeeperException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;

import co.unruly.matchers.StreamMatchers;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;

@RunWith(MockitoJUnitRunner.class)
public class ZkReadHandlerTest {
@Rule
public MockitoRule mockito = MockitoJUnit.rule();

@Mock
private CuratorFramework client;
Expand Down

0 comments on commit 1ad8d4d

Please sign in to comment.