http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java index 7bd7462..d3c1200 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherIntegrationTest.java @@ -14,6 +14,12 @@ */ package org.apache.geode.distributed; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.BDDAssertions.then; + import org.apache.geode.distributed.ServerLauncher.Builder; import org.apache.geode.distributed.ServerLauncher.Command; import org.apache.geode.distributed.internal.DistributionConfig; @@ -32,12 +38,6 @@ import java.io.FileWriter; import java.net.InetAddress; import java.util.Properties; -import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; -import static com.googlecode.catchexception.apis.BDDCatchException.when; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.BDDAssertions.then; -import static org.apache.geode.distributed.ConfigurationProperties.*; - /** * Integration tests for ServerLauncher class. These tests may require file system and/or network * I/O. @@ -157,7 +157,7 @@ public class ServerLauncherIntegrationTest { gemfireProperties); // when: starting with null MemberName - ServerLauncher launcher = new Builder().setCommand(Command.START).setMemberName(null).build(); + ServerLauncher launcher = new Builder().setCommand(Command.START).build(); // then: name in gemfire.properties file should be used for MemberName assertThat(launcher).isNotNull();
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java index f5d6271..98f73d8 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/ServerLauncherTest.java @@ -14,17 +14,24 @@ */ package org.apache.geode.distributed; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.server.CacheServer; import org.apache.geode.distributed.ServerLauncher.Builder; import org.apache.geode.distributed.ServerLauncher.Command; import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.distributed.support.DistributedSystemAdapter; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.test.junit.categories.UnitTest; -import edu.umd.cs.mtc.MultithreadedTestCase; -import edu.umd.cs.mtc.TestFramework; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.lib.concurrent.Synchroniser; @@ -42,9 +49,8 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; - -import static org.junit.Assert.*; -import static org.apache.geode.distributed.ConfigurationProperties.*; +import edu.umd.cs.mtc.MultithreadedTestCase; +import edu.umd.cs.mtc.TestFramework; /** * The ServerLauncherTest class is a test suite of unit tests testing the contract, functionality @@ -77,6 +83,7 @@ public class ServerLauncherTest { setThreadingPolicy(new Synchroniser()); } }; + DistributedSystem.removeSystem(InternalDistributedSystem.getConnectedInstance()); } @After @@ -162,8 +169,6 @@ public class ServerLauncherTest { assertNull(builder.getMemberName()); assertSame(builder, builder.setMemberName("serverOne")); assertEquals("serverOne", builder.getMemberName()); - assertSame(builder, builder.setMemberName(null)); - assertNull(builder.getMemberName()); } @Test(expected = IllegalArgumentException.class) @@ -190,6 +195,18 @@ public class ServerLauncherTest { } } + @Test(expected = IllegalArgumentException.class) + public void testSetMemberNameToNullString() { + try { + new Builder().setMemberName(null); + } catch (IllegalArgumentException expected) { + assertEquals( + LocalizedStrings.Launcher_Builder_MEMBER_NAME_ERROR_MESSAGE.toLocalizedString("Server"), + expected.getMessage()); + throw expected; + } + } + @Test public void testSetAndGetPid() { Builder builder = new Builder(); @@ -277,8 +294,6 @@ public class ServerLauncherTest { assertNull(builder.getHostNameForClients()); assertSame(builder, builder.setHostNameForClients("Pegasus")); assertEquals("Pegasus", builder.getHostNameForClients()); - assertSame(builder, builder.setHostNameForClients(null)); - assertNull(builder.getHostNameForClients()); } @Test @@ -498,8 +513,8 @@ public class ServerLauncherTest { @Test public void testBuildWithMemberNameSetInApiPropertiesOnStart() { - ServerLauncher launcher = new Builder().setCommand(ServerLauncher.Command.START) - .setMemberName(null).set(NAME, "serverABC").build(); + ServerLauncher launcher = + new Builder().setCommand(ServerLauncher.Command.START).set(NAME, "serverABC").build(); assertNotNull(launcher); assertEquals(ServerLauncher.Command.START, launcher.getCommand()); @@ -511,8 +526,7 @@ public class ServerLauncherTest { public void testBuildWithMemberNameSetInSystemPropertiesOnStart() { System.setProperty(DistributionConfig.GEMFIRE_PREFIX + NAME, "serverXYZ"); - ServerLauncher launcher = - new Builder().setCommand(ServerLauncher.Command.START).setMemberName(null).build(); + ServerLauncher launcher = new Builder().setCommand(ServerLauncher.Command.START).build(); assertNotNull(launcher); assertEquals(ServerLauncher.Command.START, launcher.getCommand()); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java index 3ec3b06..cc83faa 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/lang/ClassUtilsJUnitTest.java @@ -14,15 +14,17 @@ */ package org.apache.geode.internal.lang; -import static org.junit.Assert.*; - -import java.util.Calendar; -import java.util.Date; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import org.apache.geode.test.junit.categories.UnitTest; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.geode.test.junit.categories.UnitTest; +import java.util.Calendar; +import java.util.Date; /** * The ClassUtilsJUnitTest class is a test suite with test cases to test the contract and @@ -61,8 +63,7 @@ public class ClassUtilsJUnitTest { @Test(expected = IllegalArgumentException.class) public void testForNameWithEmptyClassName() { try { - ClassUtils.forName(StringUtils.EMPTY_STRING, - new IllegalArgumentException("Empty Class Name!")); + ClassUtils.forName(StringUtils.EMPTY, new IllegalArgumentException("Empty Class Name!")); } catch (IllegalArgumentException expected) { assertEquals("Empty Class Name!", expected.getMessage()); throw expected; http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java index f3e0abe..503356a 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/lang/StringUtilsJUnitTest.java @@ -14,19 +14,20 @@ */ package org.apache.geode.internal.lang; -import static org.junit.Assert.*; - -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.junit.Test; -import org.junit.experimental.categories.Category; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; import org.apache.geode.DataSerializer; import org.apache.geode.internal.cache.CachedDeserializable; import org.apache.geode.internal.cache.CachedDeserializableFactory; import org.apache.geode.test.junit.categories.UnitTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.IOException; /** * The StringUtilsJUnitTest is a test suite containing test cases for testing the contract and @@ -42,55 +43,7 @@ import org.apache.geode.test.junit.categories.UnitTest; @Category(UnitTest.class) public class StringUtilsJUnitTest { - @Test - public void testConcat() { - assertEquals("", StringUtils.concat((Object[]) null)); - assertEquals("", StringUtils.concat("")); - assertEquals(" ", StringUtils.concat(" ")); - assertEquals(" ", StringUtils.concat(" ")); - assertEquals("123", StringUtils.concat("123")); - assertEquals("1 2 3", StringUtils.concat("1 2 3")); - assertEquals(" 1 2 3 ", StringUtils.concat(" 1 2 3 ")); - assertEquals("trueC13.14159test", StringUtils.concat(true, 'C', 1, 3.14159f, "test")); - assertEquals("test testing tested", StringUtils.concat("test", " testing", " tested")); - } - @Test - public void testConcatWithDelimiter() { - assertEquals("", StringUtils.concat(null, null)); - assertEquals("", StringUtils.concat(null, " ")); - assertEquals("", StringUtils.concat(new Object[] {""}, " ")); - assertEquals(" ", StringUtils.concat(new Object[] {" "}, " ")); - assertEquals(" ", StringUtils.concat(new Object[] {" ", " ", " "}, " ")); - assertEquals(" | | ", StringUtils.concat(new Object[] {" ", " ", " "}, "|")); - assertEquals("abc", StringUtils.concat(new Object[] {"a", "b", "c"}, null)); - assertEquals("abc", StringUtils.concat(new Object[] {"a", "b", "c"}, "")); - assertEquals("a b c", StringUtils.concat(new Object[] {"a", "b", "c"}, " ")); - assertEquals("a b c", StringUtils.concat(new Object[] {"a", "b", "c"}, " ")); - assertEquals("a_b_c", StringUtils.concat(new Object[] {"a", "b", "c"}, "_")); - assertEquals("a|b|c", StringUtils.concat(new Object[] {"a", "b", "c"}, "|")); - assertEquals("a>b>c", StringUtils.concat(new Object[] {"a", "b", "c"}, ">")); - assertEquals("a&b&c", StringUtils.concat(new Object[] {"a", "b", "c"}, "&")); - assertEquals("*", StringUtils.concat(new Object[] {"*"}, "*")); - assertEquals("***", StringUtils.concat(new Object[] {"*", "*"}, "*")); - assertEquals("*-*", StringUtils.concat(new Object[] {"*", "*"}, "-")); - } - - @Test - public void testDefaultIfBlank() { - assertNull(StringUtils.defaultIfBlank((String[]) null)); - assertNull(null, StringUtils.defaultIfBlank(null, "")); - assertNull(null, StringUtils.defaultIfBlank(null, "", " ")); - assertNull(null, StringUtils.defaultIfBlank(null, "", " ", "\0")); - assertEquals("test", StringUtils.defaultIfBlank("test", null, "", " ")); - assertEquals("test", StringUtils.defaultIfBlank(null, "", " ", "test")); - assertEquals("test", StringUtils.defaultIfBlank(null, "", "test", " ", null)); - assertEquals("_", StringUtils.defaultIfBlank("_", null, "", " ")); - assertEquals("empty", StringUtils.defaultIfBlank(null, "", "empty", " ")); - assertEquals("blank", StringUtils.defaultIfBlank(null, "", " ", "blank")); - assertEquals("null", StringUtils.defaultIfBlank("null", null, "", " ")); - assertEquals("null", StringUtils.defaultIfBlank("null", "empty", "blank")); - } @Test public void testGetDigitsOnly() { @@ -107,186 +60,7 @@ public class StringUtilsJUnitTest { assertEquals("123456789", StringUtils.getDigitsOnly("123,456.789")); } - @Test - public void testGetLettersOnly() { - assertEquals("", StringUtils.getLettersOnly(null)); - assertEquals("", StringUtils.getLettersOnly("")); - assertEquals("", StringUtils.getLettersOnly(" ")); - assertEquals("", StringUtils.getLettersOnly("123")); - assertEquals("", StringUtils.getLettersOnly("123@$$!")); - assertEquals("", StringUtils.getLettersOnly("!@$$%#*?")); - assertEquals("", StringUtils.getLettersOnly("10101")); - assertEquals("lll", StringUtils.getLettersOnly("l0l0l")); - assertEquals("", StringUtils.getLettersOnly("007")); - assertEquals("OO", StringUtils.getLettersOnly("OO7")); - assertEquals("OOSeven", StringUtils.getLettersOnly("OOSeven")); - } - - @Test - public void testGetSpaces() { - assertEquals("", StringUtils.getSpaces(0)); - assertEquals(" ", StringUtils.getSpaces(1)); - assertEquals(" ", StringUtils.getSpaces(2)); - assertEquals(" ", StringUtils.getSpaces(3)); - assertEquals(" ", StringUtils.getSpaces(4)); - assertEquals(" ", StringUtils.getSpaces(5)); - assertEquals(" ", StringUtils.getSpaces(6)); - assertEquals(" ", StringUtils.getSpaces(7)); - assertEquals(" ", StringUtils.getSpaces(8)); - assertEquals(" ", StringUtils.getSpaces(9)); - assertEquals(" ", StringUtils.getSpaces(10)); - assertEquals(" ", StringUtils.getSpaces(11)); - assertEquals(" ", StringUtils.getSpaces(12)); - assertEquals(" ", StringUtils.getSpaces(13)); - assertEquals(" ", StringUtils.getSpaces(14)); - assertEquals(" ", StringUtils.getSpaces(15)); - assertEquals(" ", StringUtils.getSpaces(16)); - assertEquals(" ", StringUtils.getSpaces(17)); - assertEquals(" ", StringUtils.getSpaces(18)); - assertEquals(" ", StringUtils.getSpaces(19)); - assertEquals(" ", StringUtils.getSpaces(20)); - assertEquals(" ", StringUtils.getSpaces(21)); - } - - @Test - public void testIsBlank() { - assertTrue(StringUtils.isBlank(null)); - assertTrue(StringUtils.isBlank("")); - assertTrue(StringUtils.isBlank("\0")); - assertTrue(StringUtils.isBlank(" ")); - assertTrue(StringUtils.isBlank(" ")); - } - - @Test - public void testIsNotBlank() { - assertFalse(StringUtils.isBlank("test")); - assertFalse(StringUtils.isBlank("null")); - assertFalse(StringUtils.isBlank("empty")); - assertFalse(StringUtils.isBlank("_")); - assertFalse(StringUtils.isBlank("____")); - } - - @Test - public void testIsEmpty() { - assertTrue(StringUtils.isEmpty("")); - } - - @Test - public void testIsNotEmpty() { - assertFalse(StringUtils.isEmpty("test")); - assertFalse(StringUtils.isEmpty("null")); - assertFalse(StringUtils.isEmpty("empty")); - assertFalse(StringUtils.isEmpty(null)); - assertFalse(StringUtils.isEmpty(" ")); - assertFalse(StringUtils.isEmpty(" ")); - assertFalse(StringUtils.isEmpty("_")); - assertFalse(StringUtils.isEmpty("___")); - } - @Test - public void testPadEnding() { - assertEquals("", StringUtils.padEnding("", 'X', 0)); - assertEquals(" ", StringUtils.padEnding(" ", 'X', 0)); - assertEquals(" ", StringUtils.padEnding(" ", 'X', 1)); - assertEquals(" ", StringUtils.padEnding(" ", 'X', 0)); - assertEquals(" ", StringUtils.padEnding(" ", 'X', 3)); - assertEquals("X", StringUtils.padEnding("", 'X', 1)); - assertEquals(" X", StringUtils.padEnding(" ", 'X', 2)); - assertEquals(" XX", StringUtils.padEnding(" ", 'X', 4)); - assertEquals("test", StringUtils.padEnding("test", 'X', 0)); - assertEquals("test", StringUtils.padEnding("test", 'X', 4)); - assertEquals("testX", StringUtils.padEnding("test", 'X', 5)); - assertEquals("testXXX", StringUtils.padEnding("test", 'X', 7)); - } - - @Test(expected = NullPointerException.class) - public void testPadEndingWithNull() { - try { - StringUtils.padEnding(null, 'X', 10); - } catch (NullPointerException expected) { - assertEquals("The String value to pad cannot be null!", expected.getMessage()); - throw expected; - } - } - - @Test - public void testToLowerCase() { - assertNull(StringUtils.toLowerCase(null)); - assertEquals("null", StringUtils.toLowerCase("null")); - assertEquals("null", StringUtils.toLowerCase("NULL")); - assertEquals("", StringUtils.toLowerCase("")); - assertEquals(" ", StringUtils.toLowerCase(" ")); - assertEquals("test", StringUtils.toLowerCase("TEST")); - assertEquals("1", StringUtils.toLowerCase("1")); - assertEquals("!", StringUtils.toLowerCase("!")); - assertEquals("$00", StringUtils.toLowerCase("$00")); - assertEquals("jon doe", StringUtils.toLowerCase("Jon Doe")); - } - - @Test - public void testToUpperCase() { - assertNull(StringUtils.toUpperCase(null)); - assertEquals("NULL", StringUtils.toUpperCase("NULL")); - assertEquals("NULL", StringUtils.toUpperCase("null")); - assertEquals("", StringUtils.toUpperCase("")); - assertEquals(" ", StringUtils.toUpperCase(" ")); - assertEquals("TEST", StringUtils.toUpperCase("test")); - assertEquals("2", StringUtils.toUpperCase("2")); - assertEquals("!", StringUtils.toUpperCase("!")); - assertEquals("$00", StringUtils.toUpperCase("$00")); - assertEquals("JON DOE", StringUtils.toUpperCase("Jon Doe")); - } - - @Test - public void testTrim() { - assertNull(StringUtils.trim(null)); - assertEquals("", StringUtils.trim("")); - assertEquals("", StringUtils.trim(" ")); - assertEquals("", StringUtils.trim(" ")); - assertEquals("null", StringUtils.trim("null")); - assertEquals("test", StringUtils.trim(" test")); - assertEquals("test", StringUtils.trim("test ")); - assertEquals("test", StringUtils.trim(" test ")); - assertEquals("a b c d", StringUtils.trim(" a b c d ")); - } - - @Test - public void testTruncate() { - assertEquals("", StringUtils.truncate("", 0)); - assertEquals("", StringUtils.truncate("", 1)); - assertEquals(" ", StringUtils.truncate(" ", 1)); - assertEquals(" ", StringUtils.truncate(" ", 5)); - assertEquals(" ", StringUtils.truncate(" ", 1)); - assertEquals("XX", StringUtils.truncate("XXX", 2)); - assertEquals("XX", StringUtils.truncate("XX", 4)); - } - - @Test(expected = IllegalArgumentException.class) - public void testTruncateWithNegativeLength() { - try { - StringUtils.truncate("XX", -1); - } catch (IllegalArgumentException expected) { - assertEquals("Length must be greater than equal to 0!", expected.getMessage()); - throw expected; - } - } - - @Test - public void testValueOf() { - assertEquals("null", StringUtils.valueOf(null)); - assertEquals("null", StringUtils.valueOf(null, (String[]) null)); - assertEquals("null", StringUtils.valueOf(null, new String[] {})); - assertEquals("test", StringUtils.valueOf(null, "test")); - assertEquals("nil", StringUtils.valueOf(null, "nil", "test")); - assertEquals("test", StringUtils.valueOf("test", (String[]) null)); - assertEquals("null", StringUtils.valueOf("null", "test")); - assertEquals("nil", StringUtils.valueOf("nil", "mock", "test")); - assertEquals("", StringUtils.valueOf("", "test", "mock", "null")); - assertEquals(" ", StringUtils.valueOf(" ", "test", "mock", "nil")); - assertEquals("true", StringUtils.valueOf(true, "test", "nil", null)); - assertEquals("1", StringUtils.valueOf(1, "one")); - assertEquals(String.valueOf(Math.PI), StringUtils.valueOf(Math.PI, "314159")); - } @Test public void testWrap() { http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java index 36be8b8..c760597 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/util/CollectionUtilsJUnitTest.java @@ -14,7 +14,19 @@ */ package org.apache.geode.internal.util; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import org.apache.commons.lang.StringUtils; +import org.apache.geode.test.junit.categories.UnitTest; +import org.junit.Test; +import org.junit.experimental.categories.Category; import java.util.ArrayList; import java.util.Arrays; @@ -26,18 +38,11 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Vector; import java.util.Map.Entry; +import java.util.NoSuchElementException; import java.util.Properties; import java.util.Set; - -import org.apache.geode.internal.lang.Filter; -import org.apache.geode.internal.lang.StringUtils; -import org.apache.geode.test.junit.categories.UnitTest; - -import org.junit.Test; -import org.junit.experimental.categories.Category; +import java.util.Vector; /** * The CollectionUtilsJUnitTest class is a test suite of test cases testing the contract and @@ -105,7 +110,7 @@ public class CollectionUtilsJUnitTest { @Test public void testCreateMultipleProperties() { - Map<String, String> map = new HashMap<String, String>(3); + Map<String, String> map = new HashMap<>(3); map.put("one", "A"); map.put("two", "B"); @@ -141,7 +146,7 @@ public class CollectionUtilsJUnitTest { @Test public void testEmptyListWithEmptyList() { - final List<Object> expectedList = new ArrayList<Object>(0); + final List<Object> expectedList = new ArrayList<>(0); assertNotNull(expectedList); assertTrue(expectedList.isEmpty()); @@ -174,7 +179,7 @@ public class CollectionUtilsJUnitTest { @Test public void testEmptySetWithEmptySet() { - final Set<Object> expectedSet = new HashSet<Object>(0); + final Set<Object> expectedSet = new HashSet<>(0); assertNotNull(expectedSet); assertTrue(expectedSet.isEmpty()); @@ -187,7 +192,7 @@ public class CollectionUtilsJUnitTest { @Test public void testEmptySetWithSet() { final Set<String> expectedSet = - new HashSet<String>(Arrays.asList("aardvark", "baboon", "cat", "dog", "ferret")); + new HashSet<>(Arrays.asList("aardvark", "baboon", "cat", "dog", "ferret")); assertNotNull(expectedSet); assertFalse(expectedSet.isEmpty()); @@ -201,12 +206,8 @@ public class CollectionUtilsJUnitTest { public void testFindAll() { final List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9); - final List<Integer> matches = CollectionUtils.findAll(numbers, new Filter<Integer>() { - // accept all even numbers - public boolean accept(final Integer number) { - return (number % 2 == 0); - } - }); + // accept all even numbers + final List<Integer> matches = CollectionUtils.findAll(numbers, number -> (number % 2 == 0)); assertNotNull(matches); assertFalse(matches.isEmpty()); @@ -217,12 +218,8 @@ public class CollectionUtilsJUnitTest { public void testFindAllWhenMultipleElementsMatch() { final List<Integer> numbers = Arrays.asList(0, 1, 2, 1, 4, 1, 6, 1, 7, 1, 9); - final List<Integer> matches = CollectionUtils.findAll(numbers, new Filter<Integer>() { - // accept 1 - public boolean accept(final Integer number) { - return (number == 1); - } - }); + // accept 1 + final List<Integer> matches = CollectionUtils.findAll(numbers, number -> (number == 1)); assertNotNull(matches); assertEquals(5, matches.size()); @@ -233,12 +230,8 @@ public class CollectionUtilsJUnitTest { public void testFindAllWhenNoElementsMatch() { final List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 8, 9); - final List<Integer> matches = CollectionUtils.findAll(numbers, new Filter<Integer>() { - // accept negative numbers - public boolean accept(final Integer number) { - return (number < 0); - } - }); + // accept negative numbers + final List<Integer> matches = CollectionUtils.findAll(numbers, number -> (number < 0)); assertNotNull(matches); assertTrue(matches.isEmpty()); @@ -248,12 +241,8 @@ public class CollectionUtilsJUnitTest { public void testFindBy() { final List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9); - final Integer match = CollectionUtils.findBy(numbers, new Filter<Integer>() { - // accept 2 - public boolean accept(final Integer number) { - return (number == 2); - } - }); + // accept 2 + final Integer match = CollectionUtils.findBy(numbers, number -> (number == 2)); assertNotNull(match); assertEquals(2, match.intValue()); @@ -263,12 +252,8 @@ public class CollectionUtilsJUnitTest { public void testFindByWhenMultipleElementsMatch() { final List<Integer> numbers = Arrays.asList(0, 1, 2, 1, 4, 1, 6, 1, 7, 1, 9); - final Integer match = CollectionUtils.findBy(numbers, new Filter<Integer>() { - // accept 1 - public boolean accept(final Integer number) { - return (number == 1); - } - }); + // accept 1 + final Integer match = CollectionUtils.findBy(numbers, number -> (number == 1)); assertNotNull(match); assertEquals(1, match.intValue()); @@ -278,19 +263,15 @@ public class CollectionUtilsJUnitTest { public void testFindByWhenNoElementsMatch() { final List<Integer> numbers = Arrays.asList(0, 1, 2, 3, 4, 5, 6, 7, 7, 8, 9); - final Integer match = CollectionUtils.findBy(numbers, new Filter<Integer>() { - // accept 10 - public boolean accept(final Integer number) { - return (number == 10); - } - }); + // accept 10 + final Integer match = CollectionUtils.findBy(numbers, number -> (number == 10)); assertNull(match); } @Test public void testRemoveKeys() { - final Map<Object, String> expectedMap = new HashMap<Object, String>(6); + final Map<Object, String> expectedMap = new HashMap<>(6); expectedMap.put("key1", "value"); expectedMap.put("key2", "null"); @@ -303,12 +284,7 @@ public class CollectionUtilsJUnitTest { assertEquals(6, expectedMap.size()); final Map<Object, String> actualMap = - CollectionUtils.removeKeys(expectedMap, new Filter<Map.Entry<Object, String>>() { - @Override - public boolean accept(final Map.Entry<Object, String> entry) { - return !StringUtils.isBlank(entry.getValue()); - } - }); + CollectionUtils.removeKeys(expectedMap, entry -> StringUtils.isNotBlank(entry.getValue())); assertSame(expectedMap, actualMap); assertFalse(actualMap.isEmpty()); @@ -318,7 +294,7 @@ public class CollectionUtilsJUnitTest { @Test public void testRemoveKeysWithNullValues() { - final Map<Object, Object> expectedMap = new HashMap<Object, Object>(3); + final Map<Object, Object> expectedMap = new HashMap<>(3); expectedMap.put("one", "test"); expectedMap.put("two", null); @@ -350,7 +326,7 @@ public class CollectionUtilsJUnitTest { @Test public void testRemoveKeysWithNullValuesFromMapWithNoNullValues() { - final Map<String, Object> map = new HashMap<String, Object>(5); + final Map<String, Object> map = new HashMap<>(5); map.put("one", "test"); map.put("null", "null"); @@ -430,7 +406,7 @@ public class CollectionUtilsJUnitTest { list.add("one"); list.add("two"); - boolean modified = CollectionUtils.addAll(list, (Enumeration<String>) null); + boolean modified = CollectionUtils.addAll(list, null); assertTrue(!modified); assertEquals(2, list.size()); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java index 91a59f8..7fedb9f 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java @@ -14,21 +14,12 @@ */ package org.apache.geode.management.internal.cli.commands; -import static org.junit.Assert.*; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Collections; -import java.util.Set; - -import org.jmock.Expectations; -import org.jmock.Mockery; -import org.jmock.lib.concurrent.Synchroniser; -import org.jmock.lib.legacy.ClassImposteriser; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionService; @@ -41,6 +32,19 @@ import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.MemberNotFoundException; import org.apache.geode.test.junit.categories.UnitTest; +import org.jmock.Expectations; +import org.jmock.Mockery; +import org.jmock.lib.concurrent.Synchroniser; +import org.jmock.lib.legacy.ClassImposteriser; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Collections; +import java.util.Set; /** * The AbstractCommandsSupportJUnitTest class is a test suite of test cases testing the contract and @@ -140,9 +144,9 @@ public class AbstractCommandsSupportJUnitTest { @Test public void testConvertDefaultValue() { - assertNull(AbstractCommandsSupport.convertDefaultValue(null, StringUtils.EMPTY_STRING)); - assertEquals(StringUtils.EMPTY_STRING, - AbstractCommandsSupport.convertDefaultValue(StringUtils.EMPTY_STRING, "test")); + assertNull(AbstractCommandsSupport.convertDefaultValue(null, StringUtils.EMPTY)); + assertEquals(StringUtils.EMPTY, + AbstractCommandsSupport.convertDefaultValue(StringUtils.EMPTY, "test")); assertEquals(StringUtils.SPACE, AbstractCommandsSupport.convertDefaultValue(StringUtils.SPACE, "testing")); assertEquals("tested", AbstractCommandsSupport http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java index 8bf1c43..5ff0a67 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandDUnitTest.java @@ -14,14 +14,27 @@ */ package org.apache.geode.management.internal.cli.commands; -import org.apache.geode.cache.*; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.apache.geode.test.dunit.Assert.assertEquals; +import static org.apache.geode.test.dunit.Assert.assertNotNull; +import static org.apache.geode.test.dunit.Assert.assertSame; +import static org.apache.geode.test.dunit.Assert.assertTrue; +import static org.apache.geode.test.dunit.LogWriterUtils.getDUnitLogLevel; +import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; + +import org.apache.commons.lang.StringUtils; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.cache.Scope; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.IndexStatistics; import org.apache.geode.cache.query.IndexType; import org.apache.geode.cache.query.SelectResults; import org.apache.geode.internal.lang.MutableIdentifiable; import org.apache.geode.internal.lang.ObjectUtils; -import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.domain.IndexDetails; import org.apache.geode.management.internal.cli.i18n.CliStrings; @@ -34,15 +47,17 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import java.util.Random; +import java.util.Set; import java.util.concurrent.atomic.AtomicLong; -import static org.apache.geode.test.dunit.Assert.*; -import static org.apache.geode.test.dunit.LogWriterUtils.getDUnitLogLevel; -import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter; - -import static org.apache.geode.distributed.ConfigurationProperties.*; - /** * The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the * index-based GemFire shell (Gfsh) commands. @@ -57,7 +72,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase { private static final int DEFAULT_REGION_INITIAL_CAPACITY = 10000; - private final AtomicLong idGenerator = new AtomicLong(0l); + private final AtomicLong idGenerator = new AtomicLong(0L); @Override public final void postSetUpCliCommandTestBase() throws Exception { @@ -186,7 +201,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase { final Random random = new Random(System.currentTimeMillis()); int count = 0; - final List<Proxy> proxies = new ArrayList<Proxy>(); + final List<Proxy> proxies = new ArrayList<>(); Consumer consumer; Proxy proxy; @@ -232,7 +247,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase { final Random random = new Random(System.currentTimeMillis()); int count = 0; - final List<Proxy> proxies = new ArrayList<Proxy>(); + final List<Proxy> proxies = new ArrayList<>(); Producer producer; Proxy proxy; @@ -322,7 +337,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase { private final Properties distributedSystemProperties; - private final Set<RegionDefinition> regions = new HashSet<RegionDefinition>(); + private final Set<RegionDefinition> regions = new HashSet<>(); private final VM vm; @@ -471,14 +486,14 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase { private final Class<?> keyConstraint; private final Class<?> valueConstraint; - private final Set<Index> indexes = new HashSet<Index>(); + private final Set<Index> indexes = new HashSet<>(); private final String regionName; @SuppressWarnings("unchecked") protected RegionDefinition(final String regionName, final Class<?> keyConstraint, final Class<?> valueConstraint) { - assert !StringUtils.isBlank(regionName) : "The name of the Region must be specified!"; + assert StringUtils.isNotBlank(regionName) : "The name of the Region must be specified!"; this.regionName = regionName; this.keyConstraint = ObjectUtils.defaultIfNull(keyConstraint, Object.class); this.valueConstraint = ObjectUtils.defaultIfNull(valueConstraint, Object.class); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java index fc920c4..cea77fa 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java @@ -21,14 +21,13 @@ import static java.util.stream.Collectors.toSet; import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE_SIZE_LIMIT; import static org.assertj.core.api.Assertions.assertThat; +import org.apache.commons.lang.StringUtils; import org.apache.geode.cache.Cache; import org.apache.geode.distributed.internal.ClusterConfigurationService; import org.apache.geode.distributed.internal.InternalLocator; import org.apache.geode.internal.ClassPathLoader; import org.apache.geode.internal.DeployedJar; -import org.apache.geode.internal.JarDeployer; import org.apache.geode.internal.cache.GemFireCacheImpl; -import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.configuration.domain.Configuration; import org.apache.geode.test.dunit.rules.Locator; import org.apache.geode.test.dunit.rules.LocatorServerStartupRule; @@ -41,7 +40,6 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -93,7 +91,7 @@ public class ClusterConfig implements Serializable { Set<String> expectedGroupConfigs = this.getGroups().stream().map(ConfigGroup::getName).collect(toSet()); - // verify info exists in memeory + // verify info exists in memory locatorVM.invoke(() -> { InternalLocator internalLocator = LocatorServerStartupRule.locatorStarter.getLocator(); ClusterConfigurationService sc = internalLocator.getSharedConfiguration(); @@ -107,8 +105,8 @@ public class ClusterConfig implements Serializable { Configuration config = sc.getConfiguration(configGroup.name); assertThat(config.getJarNames()).isEqualTo(configGroup.getJars()); - // verify proeprty is as expected - if (!StringUtils.isBlank(configGroup.getMaxLogFileSize())) { + // verify property is as expected + if (StringUtils.isNotBlank(configGroup.getMaxLogFileSize())) { Properties props = config.getGemfireProperties(); assertThat(props.getProperty(LOG_FILE_SIZE_LIMIT)) .isEqualTo(configGroup.getMaxLogFileSize()); @@ -135,7 +133,7 @@ public class ClusterConfig implements Serializable { } } - public void verifyServer(MemberVM<Server> serverVM) throws ClassNotFoundException { + public void verifyServer(MemberVM<Server> serverVM) { // verify files exist in filesystem Set<String> expectedJarNames = this.getJarNames().stream().collect(toSet()); @@ -156,7 +154,7 @@ public class ClusterConfig implements Serializable { assertThat(cache.getRegion(region)).isNotNull(); } - if (!StringUtils.isBlank(this.getMaxLogFileSize())) { + if (StringUtils.isNotBlank(this.getMaxLogFileSize())) { Properties props = cache.getDistributedSystem().getProperties(); assertThat(props.getProperty(LOG_FILE_SIZE_LIMIT)).isEqualTo(this.getMaxLogFileSize()); } http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java index 19a1662..bc709db 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java @@ -17,7 +17,7 @@ package org.apache.geode.test.dunit.rules; import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException; import static org.assertj.core.api.Assertions.assertThat; -import org.apache.geode.internal.lang.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.HeadlessGfsh; http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java index b2be12a..033fedc 100755 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java @@ -14,6 +14,7 @@ */ package org.apache.geode.cache.lucene.internal.cli; +import org.apache.commons.lang.StringUtils; import org.apache.geode.SystemFailure; import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.Execution; @@ -28,7 +29,6 @@ import org.apache.geode.cache.lucene.internal.cli.functions.LuceneSearchIndexFun import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.execute.AbstractExecution; -import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.internal.security.IntegratedSecurityService; import org.apache.geode.internal.security.SecurityService; import org.apache.geode.management.cli.CliMetaData; @@ -82,11 +82,10 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { @CliCommand(value = LuceneCliStrings.LUCENE_LIST_INDEX, help = LuceneCliStrings.LUCENE_LIST_INDEX__HELP) - @CliMetaData(shellOnly = false, - relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) + @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) @ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ) public Result listIndex(@CliOption(key = LuceneCliStrings.LUCENE_LIST_INDEX__STATS, - mandatory = false, specifiedDefaultValue = "true", unspecifiedDefaultValue = "false", + specifiedDefaultValue = "true", unspecifiedDefaultValue = "false", help = LuceneCliStrings.LUCENE_LIST_INDEX__STATS__HELP) final boolean stats) { try { @@ -120,7 +119,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { List<LuceneIndexDetails> sortedResults = results.stream().flatMap(set -> set.stream()).sorted().collect(Collectors.toList()); - LinkedHashSet<LuceneIndexDetails> uniqResults = new LinkedHashSet<LuceneIndexDetails>(); + LinkedHashSet<LuceneIndexDetails> uniqResults = new LinkedHashSet<>(); uniqResults.addAll(sortedResults); sortedResults.clear(); sortedResults.addAll(uniqResults); @@ -137,10 +136,9 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { indexData.accumulate("Server Name", indexDetails.getServerName()); indexData.accumulate("Indexed Fields", indexDetails.getSearchableFieldNamesString()); indexData.accumulate("Field Analyzer", indexDetails.getFieldAnalyzersString()); - indexData.accumulate("Status", - indexDetails.getInitialized() == true ? "Initialized" : "Defined"); + indexData.accumulate("Status", indexDetails.getInitialized() ? "Initialized" : "Defined"); - if (stats == true) { + if (stats) { if (!indexDetails.getInitialized()) { indexData.accumulate("Query Executions", "NA"); indexData.accumulate("Updates", "NA"); @@ -164,8 +162,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { @CliCommand(value = LuceneCliStrings.LUCENE_CREATE_INDEX, help = LuceneCliStrings.LUCENE_CREATE_INDEX__HELP) - @CliMetaData(shellOnly = false, - relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) + @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) // TODO : Add optionContext for indexName public Result createIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, mandatory = true, help = LuceneCliStrings.LUCENE_CREATE_INDEX__NAME__HELP) final String indexName, @@ -177,11 +174,10 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { @CliOption(key = LuceneCliStrings.LUCENE_CREATE_INDEX__FIELD, mandatory = true, help = LuceneCliStrings.LUCENE_CREATE_INDEX__FIELD_HELP) final String[] fields, - @CliOption(key = LuceneCliStrings.LUCENE_CREATE_INDEX__ANALYZER, mandatory = false, - unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, + @CliOption(key = LuceneCliStrings.LUCENE_CREATE_INDEX__ANALYZER, help = LuceneCliStrings.LUCENE_CREATE_INDEX__ANALYZER_HELP) final String[] analyzers) { - Result result = null; + Result result; XmlEntity xmlEntity = null; this.securityService.authorizeRegionManage(regionPath); @@ -222,8 +218,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { @CliCommand(value = LuceneCliStrings.LUCENE_DESCRIBE_INDEX, help = LuceneCliStrings.LUCENE_DESCRIBE_INDEX__HELP) - @CliMetaData(shellOnly = false, - relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) + @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) @ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ) public Result describeIndex( @CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, mandatory = true, @@ -262,8 +257,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { @CliCommand(value = LuceneCliStrings.LUCENE_SEARCH_INDEX, help = LuceneCliStrings.LUCENE_SEARCH_INDEX__HELP) - @CliMetaData(shellOnly = false, - relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) + @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) @ResourceOperation(resource = Resource.DATA, operation = Operation.WRITE) public Result searchIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, mandatory = true, help = LuceneCliStrings.LUCENE_SEARCH_INDEX__NAME__HELP) final String indexName, @@ -278,15 +272,14 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__DEFAULT_FIELD, mandatory = true, help = LuceneCliStrings.LUCENE_SEARCH_INDEX__DEFAULT_FIELD__HELP) final String defaultField, - @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__LIMIT, mandatory = false, - unspecifiedDefaultValue = "-1", + @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__LIMIT, unspecifiedDefaultValue = "-1", help = LuceneCliStrings.LUCENE_SEARCH_INDEX__LIMIT__HELP) final int limit, - @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__PAGE_SIZE, mandatory = false, + @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__PAGE_SIZE, unspecifiedDefaultValue = "-1", help = LuceneCliStrings.LUCENE_SEARCH_INDEX__PAGE_SIZE__HELP) int pageSize, - @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__KEYSONLY, mandatory = false, + @CliOption(key = LuceneCliStrings.LUCENE_SEARCH_INDEX__KEYSONLY, unspecifiedDefaultValue = "false", help = LuceneCliStrings.LUCENE_SEARCH_INDEX__KEYSONLY__HELP) boolean keysOnly) { try { @@ -315,11 +308,9 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { @CliCommand(value = LuceneCliStrings.LUCENE_DESTROY_INDEX, help = LuceneCliStrings.LUCENE_DESTROY_INDEX__HELP) - @CliMetaData(shellOnly = false, - relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) - public Result destroyIndex( - @CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, mandatory = false, - help = LuceneCliStrings.LUCENE_DESTROY_INDEX__NAME__HELP) final String indexName, + @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) + public Result destroyIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, + help = LuceneCliStrings.LUCENE_DESTROY_INDEX__NAME__HELP) final String indexName, @CliOption(key = LuceneCliStrings.LUCENE__REGION_PATH, mandatory = true, optionContext = ConverterHint.REGION_PATH, @@ -329,7 +320,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport { CliStrings.format(LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__REGION_CANNOT_BE_EMPTY)); } - if (StringUtils.isEmpty(indexName)) { + if (indexName != null && StringUtils.isEmpty(indexName)) { return ResultBuilder.createInfoResult( CliStrings.format(LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__INDEX_CANNOT_BE_EMPTY)); } http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java index f7edd8f..a5ec7d5 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/functions/LuceneCreateIndexFunction.java @@ -15,6 +15,7 @@ package org.apache.geode.cache.lucene.internal.cli.functions; +import org.apache.commons.lang.StringUtils; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.execute.FunctionAdapter; @@ -26,12 +27,10 @@ import org.apache.geode.cache.lucene.internal.cli.LuceneCliStrings; import org.apache.geode.cache.lucene.internal.cli.LuceneIndexDetails; import org.apache.geode.cache.lucene.internal.cli.LuceneIndexInfo; import org.apache.geode.internal.InternalEntity; -import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.configuration.domain.XmlEntity; - import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java index d4dca4a..143e99d 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java @@ -14,32 +14,18 @@ */ package org.apache.geode.cache.lucene.internal.cli; -import static org.junit.Assert.*; +import static junit.framework.TestCase.assertSame; +import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.isA; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import junitparams.JUnitParamsRunner; -import junitparams.Parameters; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.core.KeywordAnalyzer; -import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.junit.Assert; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; -import org.mockito.ArgumentCaptor; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.ResultCollector; @@ -60,6 +46,25 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.result.TabularResultData; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.test.junit.categories.UnitTest; +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.core.KeywordAnalyzer; +import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.junit.Assert; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import junitparams.JUnitParamsRunner; +import junitparams.Parameters; /** * The LuceneIndexCommandsJUnitTest class is a test suite of test cases testing the contract and @@ -409,7 +414,7 @@ public class LuceneIndexCommandsJUnitTest { final ResultCollector mockResultCollector = mock(ResultCollector.class); final List<CliFunctionResult> cliFunctionResults = new ArrayList<>(); - String expectedStatus = null; + String expectedStatus; if (expectedToSucceed) { expectedStatus = CliStrings.format( LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEX_0_FROM_REGION_1, @@ -446,7 +451,7 @@ public class LuceneIndexCommandsJUnitTest { final ResultCollector mockResultCollector = mock(ResultCollector.class); final List<CliFunctionResult> cliFunctionResults = new ArrayList<>(); - String expectedStatus = null; + String expectedStatus; if (expectedToSucceed) { expectedStatus = CliStrings.format( LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEX_0_FROM_REGION_1, @@ -478,7 +483,7 @@ public class LuceneIndexCommandsJUnitTest { final ResultCollector mockResultCollector = mock(ResultCollector.class); final List<CliFunctionResult> cliFunctionResults = new ArrayList<>(); - String expectedStatus = null; + String expectedStatus; if (expectedToSucceed) { expectedStatus = CliStrings.format( LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEXES_FROM_REGION_0, @@ -515,7 +520,7 @@ public class LuceneIndexCommandsJUnitTest { final ResultCollector mockResultCollector = mock(ResultCollector.class); final List<CliFunctionResult> cliFunctionResults = new ArrayList<>(); - String expectedStatus = null; + String expectedStatus; if (expectedToSucceed) { expectedStatus = CliStrings.format( LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__SUCCESSFULLY_DESTROYED_INDEXES_FROM_REGION_0, @@ -564,8 +569,8 @@ public class LuceneIndexCommandsJUnitTest { } // Verify each status List<String> status = data.retrieveAllValues("Status"); - for (int i = 0; i < status.size(); i++) { - assertEquals(expectedStatus, status.get(i)); + for (String statu : status) { + assertEquals(expectedStatus, statu); } } http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java index 6ee5b53..7ce9c46 100644 --- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java +++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java @@ -34,7 +34,6 @@ import org.apache.geode.tools.pulse.testbed.GemFireDistributedSystem.Server; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -57,7 +56,7 @@ public class PropMockDataUpdater implements IClusterUpdater { private Cluster cluster = null; private TestBed testbed; - private final String testbedFile = System.getProperty("pulse.propMockDataUpdaterFile");; + private final String testbedFile = System.getProperty("pulse.propMockDataUpdaterFile"); private final ObjectMapper mapper = new ObjectMapper(); @@ -65,14 +64,12 @@ public class PropMockDataUpdater implements IClusterUpdater { this.cluster = cluster; try { loadPropertiesFile(); - } catch (FileNotFoundException e) { - throw new RuntimeException(e); } catch (IOException e) { throw new RuntimeException(e); } } - private void loadPropertiesFile() throws FileNotFoundException, IOException { + private void loadPropertiesFile() throws IOException { this.testbed = new TestBed(testbedFile, true); } @@ -161,8 +158,8 @@ public class PropMockDataUpdater implements IClusterUpdater { } for (Entry<String, Member> memberSet : membersHMap.entrySet()) { - HashMap<String, Cluster.Region> memberRegions = new HashMap<String, Cluster.Region>(); - HashMap<String, Cluster.Client> memberClientsHM = new HashMap<String, Cluster.Client>(); + HashMap<String, Cluster.Region> memberRegions = new HashMap<>(); + HashMap<String, Cluster.Client> memberClientsHM = new HashMap<>(); Random randomGenerator = new Random(); @@ -277,10 +274,6 @@ public class PropMockDataUpdater implements IClusterUpdater { memberRegion.setWanEnabled(false); } memberRegion.setWanEnabled(true); - /* - * memberRegion.setSystemRegionEntryCount(Long.valueOf(String.valueOf(Math - * .abs(randomGenerator.nextInt(100))))); - */ memberRegion.getMemberName().add(memName); memberRegion.setMemberCount(memberCount); return memberRegion; @@ -369,7 +362,7 @@ public class PropMockDataUpdater implements IClusterUpdater { if (memberArrList != null) { memberArrList.add(m); } else { - ArrayList<Cluster.Member> memberList = new ArrayList<Cluster.Member>(); + ArrayList<Cluster.Member> memberList = new ArrayList<>(); memberList.add(m); physicalToMember.put(m.getHost(), memberList); } http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java ---------------------------------------------------------------------- diff --git a/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java b/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java index 096e4d5..7407cc8 100644 --- a/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java +++ b/geode-spark-connector/geode-functions/src/main/java/org/apache/geode/spark/connector/internal/geodefunctions/RetrieveRegionFunction.java @@ -16,25 +16,24 @@ */ package org.apache.geode.spark.connector.internal.geodefunctions; -import java.util.Iterator; -import org.apache.logging.log4j.Logger; - import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionContext; import org.apache.geode.cache.execute.FunctionException; +import org.apache.geode.cache.partition.PartitionRegionHelper; import org.apache.geode.cache.query.Query; import org.apache.geode.cache.query.QueryService; import org.apache.geode.cache.query.SelectResults; import org.apache.geode.cache.query.Struct; -import org.apache.geode.internal.cache.*; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.execute.Function; -import org.apache.geode.cache.execute.FunctionContext; -import org.apache.geode.cache.partition.PartitionRegionHelper; import org.apache.geode.internal.cache.execute.InternalRegionFunctionContext; import org.apache.geode.internal.cache.execute.InternalResultSender; import org.apache.geode.internal.cache.partitioned.PREntriesIterator; import org.apache.geode.internal.logging.LogService; +import org.apache.logging.log4j.Logger; + +import java.util.Iterator; /** * GemFire function that is used by `SparkContext.geodeRegion(regionPath, whereClause)` @@ -85,10 +84,11 @@ public class RetrieveRegionFunction implements Function { InternalRegionFunctionContext irfc = (InternalRegionFunctionContext) context; LocalRegion localRegion = (LocalRegion) irfc.getDataSet(); boolean partitioned = localRegion.getDataPolicy().withPartitioning(); - if (where.trim().isEmpty()) + if (StringUtils.isBlank(where)) { retrieveFullRegion(irfc, partitioned, taskDesc); - else + } else { retrieveRegionWithWhereClause(irfc, localRegion, partitioned, where, taskDesc); + } } /** ------------------------------------------ */ http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java index eac0b8d..73be12a 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/AbstractWebTestCase.java @@ -14,6 +14,9 @@ */ package org.apache.geode.management.internal.web; +import org.apache.commons.lang.StringUtils; +import org.apache.geode.management.internal.web.domain.Link; + import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; @@ -22,9 +25,6 @@ import java.net.URLEncoder; import java.util.HashMap; import java.util.Map; -import org.apache.geode.internal.lang.StringUtils; -import org.apache.geode.management.internal.web.domain.Link; - /** * The AbstractWebDomainTests class is abstract base class containing functionality common to a test * suite classes in the org.apache.geode.management.internal.web.domain package. @@ -48,7 +48,7 @@ public abstract class AbstractWebTestCase { assert values != null : "The Values for the Map cannot be null!"; assert keys.length == values.length; - final Map<K, V> map = new HashMap<K, V>(keys.length); + final Map<K, V> map = new HashMap<>(keys.length); int index = 0; for (final K key : keys) { @@ -59,11 +59,11 @@ public abstract class AbstractWebTestCase { } protected String decode(final String encodedValue) throws UnsupportedEncodingException { - return URLDecoder.decode(encodedValue, StringUtils.UTF_8); + return URLDecoder.decode(encodedValue, "UTF-8"); } protected String encode(final String value) throws UnsupportedEncodingException { - return URLEncoder.encode(value, StringUtils.UTF_8); + return URLEncoder.encode(value, "UTF-8"); } protected String toString(final Link... links) throws UnsupportedEncodingException { @@ -71,7 +71,7 @@ public abstract class AbstractWebTestCase { int count = 0; for (final Link link : links) { - buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY_STRING).append(toString(link)); + buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY).append(toString(link)); } http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java index 37ec508..10e26f6 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/controllers/ShellCommandsControllerJUnitTest.java @@ -14,17 +14,18 @@ */ package org.apache.geode.management.internal.web.controllers; -import static org.junit.Assert.*; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import javax.servlet.http.HttpServletRequest; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import org.apache.commons.lang.StringUtils; +import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper; +import org.apache.geode.management.internal.web.domain.Link; +import org.apache.geode.management.internal.web.domain.LinkIndex; +import org.apache.geode.management.internal.web.util.UriUtils; +import org.apache.geode.test.junit.categories.UnitTest; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -37,12 +38,14 @@ import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import org.apache.geode.management.cli.CliMetaData; -import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper; -import org.apache.geode.management.internal.web.domain.Link; -import org.apache.geode.management.internal.web.domain.LinkIndex; -import org.apache.geode.management.internal.web.util.UriUtils; -import org.apache.geode.test.junit.categories.UnitTest; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.servlet.http.HttpServletRequest; /** * The ShellCommandsControllerJUnitTest class is a test suite of test cases testing the contract and @@ -123,8 +126,7 @@ public class ShellCommandsControllerJUnitTest { String[] requestParameters = requestMappingAnnotation.params(); if (requestParameters.length > 0) { - webServiceEndpoint += "?".concat( - org.apache.geode.internal.lang.StringUtils.concat(requestParameters, "&")); + webServiceEndpoint += "?".concat(StringUtils.join(requestParameters, "&")); } controllerWebServiceEndpoints.add(webServiceEndpoint); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java index c69013b..2bebd2e 100644 --- a/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java +++ b/geode-web/src/test/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvokerJUnitTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import org.apache.geode.internal.lang.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.geode.management.internal.cli.CommandRequest; import org.apache.geode.management.internal.web.AbstractWebTestCase; import org.apache.geode.management.internal.web.domain.Link; @@ -112,7 +112,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { private CommandRequest createCommandRequest(final String command, final Map<String, String> options) { - return new TestCommandRequest(command, options, Collections.<String, String>emptyMap(), null); + return new TestCommandRequest(command, options, Collections.emptyMap(), null); } private CommandRequest createCommandRequest(final String command, @@ -122,8 +122,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { private CommandRequest createCommandRequest(final String command, final Map<String, String> options, final byte[][] fileData) { - return new TestCommandRequest(command, options, Collections.<String, String>emptyMap(), - fileData); + return new TestCommandRequest(command, options, Collections.emptyMap(), fileData); } private CommandRequest createCommandRequest(final String command, @@ -145,12 +144,12 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { @Test public void testCreateHttpRequest() { - final Map<String, String> commandOptions = new HashMap<String, String>(); + final Map<String, String> commandOptions = new HashMap<>(); commandOptions.put("author", "Adams"); commandOptions.put("blankOption", " "); commandOptions.put("category", "sci-fi"); - commandOptions.put("emptyOption", StringUtils.EMPTY_STRING); + commandOptions.put("emptyOption", StringUtils.EMPTY); commandOptions.put("isbn", "0-123456789"); commandOptions.put("nullOption", null); commandOptions.put("title", "Hitch Hiker's Guide to the Galaxy"); @@ -182,12 +181,12 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { @Test public void testCreateHttpRequestWithEnvironmentVariables() { - final Map<String, String> commandOptions = new HashMap<String, String>(2); + final Map<String, String> commandOptions = new HashMap<>(2); commandOptions.put("name", "ElLibreDeCongress"); commandOptions.put("isbn", "${ISBN}"); - final Map<String, String> environment = new HashMap<String, String>(2); + final Map<String, String> environment = new HashMap<>(2); environment.put("ISBN", "0-987654321"); environment.put("VAR", "test"); @@ -209,7 +208,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { } @Test - public void testCreatHttpRequestWithFileData() { + public void testCreateHttpRequestWithFileData() { final Map<String, String> commandOptions = Collections.singletonMap("isbn", "0-123456789"); final byte[][] fileData = {"/path/to/book/content.txt".getBytes(), @@ -238,7 +237,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { @Test public void testFindAndResolveLink() throws Exception { - final Map<String, String> commandOptions = new HashMap<String, String>(); + final Map<String, String> commandOptions = new HashMap<>(); commandOptions.put("name", "BarnesN'Noble"); @@ -253,7 +252,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { assertNotNull(link); assertEquals("http://host.domain.com/service/v1/libraries/{name}", toString(link.getHref())); - commandOptions.put("author", "J.K.Rowlings"); + commandOptions.put("author", "J.K.Rowling"); link = getOperationInvoker().findLink(createCommandRequest("list-books", commandOptions)); @@ -323,8 +322,8 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { } }; - final Object actualResult = operationInvoker.processCommand( - createCommandRequest("list-libraries", Collections.<String, String>emptyMap())); + final Object actualResult = operationInvoker + .processCommand(createCommandRequest("list-libraries", Collections.emptyMap())); assertEquals(expectedResult, actualResult); } @@ -353,8 +352,8 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { protected void printWarning(final String message, final Object... args) {} }; - final Object actualResult = operationInvoker.processCommand( - createCommandRequest("get resource", Collections.<String, String>emptyMap())); + final Object actualResult = operationInvoker + .processCommand(createCommandRequest("get resource", Collections.emptyMap())); assertEquals(expectedResult, actualResult); } @@ -391,8 +390,8 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { + "Please try reconnecting or see the GemFire Manager's log file for further details.", operationInvoker.getBaseUrl(), "test"); - final Object actualResult = operationInvoker.processCommand( - createCommandRequest("list-libraries", Collections.<String, String>emptyMap())); + final Object actualResult = operationInvoker + .processCommand(createCommandRequest("list-libraries", Collections.emptyMap())); assertFalse(operationInvoker.isConnected()); assertEquals(expectedResult, actualResult); @@ -413,8 +412,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { }; try { - operationInvoker.processCommand( - createCommandRequest("get resource", Collections.<String, String>emptyMap())); + operationInvoker.processCommand(createCommandRequest("get resource", Collections.emptyMap())); } catch (RestApiCallForCommandNotFoundException e) { assertEquals("No REST API call for command (get resource) was found!", e.getMessage()); throw e; @@ -425,7 +423,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { public void testProcessCommandWhenNotConnected() { try { getOperationInvoker() - .processCommand(createCommandRequest("get-book", Collections.<String, String>emptyMap())); + .processCommand(createCommandRequest("get-book", Collections.emptyMap())); } catch (IllegalStateException e) { assertEquals( "Gfsh must be connected to the GemFire Manager in order to process commands remotely!", @@ -436,7 +434,7 @@ public class RestHttpOperationInvokerJUnitTest extends AbstractWebTestCase { private static class TestCommandRequest extends CommandRequest { - private final Map<String, String> commandParameters = new TreeMap<String, String>(); + private final Map<String, String> commandParameters = new TreeMap<>(); private final String command;