Mercurial > hg > thermostat-ng > agent
changeset 1783:de2e1504beba
Use HOST_ID_ARGUMENT/VM_ID_ARGUMENT wherever possible
Reviewed-by: jaziz, jerboaa
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-June/014340.html
line wrap: on
line diff
--- a/client/cli/src/main/java/com/redhat/thermostat/client/cli/HostVMArguments.java Tue Jun 30 14:24:29 2015 -0400 +++ b/client/cli/src/main/java/com/redhat/thermostat/client/cli/HostVMArguments.java Tue Jun 30 15:04:55 2015 -0400 @@ -45,9 +45,6 @@ public class HostVMArguments { - static final String HOST_ID_ARGUMENT = "hostId"; - static final String VM_ID_ARGUMENT = "vmId"; - private static final Translate<LocaleResources> tr = LocaleResources.createLocalizer(); private HostRef host; @@ -58,8 +55,8 @@ } public HostVMArguments(Arguments args, boolean hostRequired, boolean vmRequired) throws CommandException { - String hostId = args.getArgument(HOST_ID_ARGUMENT); - String vmId = args.getArgument(VM_ID_ARGUMENT); + String hostId = args.getArgument(Arguments.HOST_ID_ARGUMENT); + String vmId = args.getArgument(Arguments.VM_ID_ARGUMENT); if (hostRequired && hostId == null) { throw new CommandException(tr.localize(LocaleResources.HOSTID_REQUIRED_MESSAGE)); } else if (hostId == null) {
--- a/client/cli/src/test/java/com/redhat/thermostat/client/cli/internal/VMInfoCommandTest.java Tue Jun 30 14:24:29 2015 -0400 +++ b/client/cli/src/test/java/com/redhat/thermostat/client/cli/internal/VMInfoCommandTest.java Tue Jun 30 15:04:55 2015 -0400 @@ -52,6 +52,7 @@ import org.junit.BeforeClass; import org.junit.Test; +import com.redhat.thermostat.common.cli.Arguments; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; import com.redhat.thermostat.shared.locale.Translate; @@ -131,8 +132,8 @@ context.registerService(VmInfoDAO.class, vmsDAO, null); cmd = new VMInfoCommand(context); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", VM_ID); - args.addArgument("hostId", "123"); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "123"); cmd.run(cmdCtxFactory.createContext(args)); String expected = "VM ID: " + VM_ID + "\n" + "Process ID: 234\n" + @@ -157,8 +158,8 @@ context.registerService(VmInfoDAO.class, vmsDAO, null); cmd = new VMInfoCommand(context); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", VM_ID); - args.addArgument("hostId", "123"); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "123"); cmd.run(cmdCtxFactory.createContext(args)); String expected = "VM ID: " + VM_ID + "\n" + "Process ID: 234\n" + @@ -183,8 +184,8 @@ context.registerService(VmInfoDAO.class, vmsDAO, null); cmd = new VMInfoCommand(context); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", VM_ID); - args.addArgument("hostId", "123"); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "123"); cmd.run(cmdCtxFactory.createContext(args)); String expected = "VM ID: " + VM_ID + "\n" + "Process ID: 234\n" + @@ -204,8 +205,8 @@ context.registerService(AgentInfoDAO.class, agentsDAO, null); cmd = new VMInfoCommand(context); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", "234"); - args.addArgument("hostId", "123"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "234"); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "123"); try { cmd.run(cmdCtxFactory.createContext(args)); @@ -221,7 +222,7 @@ context.registerService(VmInfoDAO.class, vmsDAO, null); cmd = new VMInfoCommand(context); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", "123"); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "123"); cmd.run(cmdCtxFactory.createContext(args)); String expected = "VM ID: " + VM_ID + "\n" + "Process ID: 234\n" + @@ -242,8 +243,8 @@ context.registerService(VmInfoDAO.class, vmsDAO, null); cmd = new VMInfoCommand(context); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", "noVm"); - args.addArgument("hostId", "123"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "noVm"); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "123"); cmd.run(cmdCtxFactory.createContext(args)); String expected = "Unknown VM ID: noVm\n"; assertEquals("", cmdCtxFactory.getOutput()); @@ -265,8 +266,8 @@ when(vmsDAO.getVmInfo(vm)).thenReturn(vmInfo); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", VM_ID); - args.addArgument("hostId", "123"); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "123"); cmd.run(cmdCtxFactory.createContext(args)); String expected = "VM ID: " + vmId + "\n" + "Process ID: 234\n" + @@ -296,8 +297,8 @@ when(vmsDAO.getVmInfo(vm)).thenReturn(vmInfo); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", VM_ID); - args.addArgument("hostId", "123"); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "123"); cmd.run(cmdCtxFactory.createContext(args)); String expected = "VM ID: " + vmId + "\n" + "Process ID: 234\n" +
--- a/client/cli/src/test/java/com/redhat/thermostat/client/cli/internal/VmStatCommandTest.java Tue Jun 30 14:24:29 2015 -0400 +++ b/client/cli/src/test/java/com/redhat/thermostat/client/cli/internal/VmStatCommandTest.java Tue Jun 30 15:04:55 2015 -0400 @@ -62,6 +62,7 @@ import com.redhat.thermostat.client.cli.VMStatPrintDelegate; import com.redhat.thermostat.common.ApplicationService; import com.redhat.thermostat.common.Timer; +import com.redhat.thermostat.common.cli.Arguments; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; import com.redhat.thermostat.storage.core.VmRef; @@ -329,8 +330,8 @@ private SimpleArguments setupArguments() { SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", "234"); - args.addArgument("hostId", "123"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "234"); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "123"); args.addArgument("since", "all"); return args; }
--- a/killvm/command/src/test/java/com/redhat/thermostat/killvm/command/KillVmCommandTest.java Tue Jun 30 14:24:29 2015 -0400 +++ b/killvm/command/src/test/java/com/redhat/thermostat/killvm/command/KillVmCommandTest.java Tue Jun 30 15:04:55 2015 -0400 @@ -44,6 +44,7 @@ import org.junit.Before; import org.junit.Test; +import com.redhat.thermostat.common.cli.Arguments; import com.redhat.thermostat.common.cli.CommandContext; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; @@ -119,7 +120,7 @@ public CommandContext createContext(String vmId) { SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", vmId); + args.addArgument(Arguments.VM_ID_ARGUMENT, vmId); return cmdCtxFactory.createContext(args); }
--- a/vm-gc/command/src/test/java/com/redhat/thermostat/vm/gc/command/internal/GCCommandTest.java Tue Jun 30 14:24:29 2015 -0400 +++ b/vm-gc/command/src/test/java/com/redhat/thermostat/vm/gc/command/internal/GCCommandTest.java Tue Jun 30 15:04:55 2015 -0400 @@ -47,6 +47,7 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import com.redhat.thermostat.common.cli.Arguments; import com.redhat.thermostat.common.cli.CommandContext; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; @@ -135,7 +136,7 @@ private CommandContext createVmIdArgs(String vmId) { SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", vmId); + args.addArgument(Arguments.VM_ID_ARGUMENT, vmId); return cmdCtxFactory.createContext(args); }
--- a/vm-gc/command/src/test/java/com/redhat/thermostat/vm/gc/command/internal/ShowGcNameCommandTest.java Tue Jun 30 14:24:29 2015 -0400 +++ b/vm-gc/command/src/test/java/com/redhat/thermostat/vm/gc/command/internal/ShowGcNameCommandTest.java Tue Jun 30 15:04:55 2015 -0400 @@ -64,7 +64,7 @@ @Before public void setup() { args = mock(Arguments.class); - when(args.getArgument("vmId")).thenReturn(VM_ID); + when(args.getArgument(Arguments.VM_ID_ARGUMENT)).thenReturn(VM_ID); } @Test
--- a/vm-heap-analysis/command/src/test/java/com/redhat/thermostat/vm/heap/analysis/command/internal/DumpHeapCommandTest.java Tue Jun 30 14:24:29 2015 -0400 +++ b/vm-heap-analysis/command/src/test/java/com/redhat/thermostat/vm/heap/analysis/command/internal/DumpHeapCommandTest.java Tue Jun 30 15:04:55 2015 -0400 @@ -53,6 +53,7 @@ import org.mockito.stubbing.Answer; import com.redhat.thermostat.client.command.RequestQueue; +import com.redhat.thermostat.common.cli.Arguments; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; import com.redhat.thermostat.shared.locale.Translate; @@ -106,7 +107,7 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", "foo"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "foo"); command.run(factory.createContext(args)); @@ -154,7 +155,7 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", "bar"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "bar"); try { command.run(factory.createContext(args)); @@ -178,7 +179,7 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", "bar"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "bar"); args.addArgument("vmPid", "123"); try { @@ -203,7 +204,7 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", "bar"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "bar"); try { command.run(factory.createContext(args)); @@ -253,7 +254,7 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("vmId", VM_ID); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); try { command.run(factory.createContext(args));
--- a/vm-heap-analysis/command/src/test/java/com/redhat/thermostat/vm/heap/analysis/command/internal/ListHeapDumpsCommandTest.java Tue Jun 30 14:24:29 2015 -0400 +++ b/vm-heap-analysis/command/src/test/java/com/redhat/thermostat/vm/heap/analysis/command/internal/ListHeapDumpsCommandTest.java Tue Jun 30 15:04:55 2015 -0400 @@ -49,6 +49,7 @@ import org.junit.BeforeClass; import org.junit.Test; +import com.redhat.thermostat.common.cli.Arguments; import com.redhat.thermostat.common.cli.Command; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; @@ -179,7 +180,7 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", "host1"); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "host1"); command.run(factory.createContext(args)); @@ -224,8 +225,8 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", "host1"); - args.addArgument("vmId", "1"); // vm id must be an int for the arg parser to work + args.addArgument(Arguments.HOST_ID_ARGUMENT, "host1"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "1"); // vm id must be an int for the arg parser to work command.run(factory.createContext(args));
--- a/vm-heap-analysis/command/src/test/java/com/redhat/thermostat/vm/heap/analysis/command/internal/SaveHeapDumpToFileCommandTest.java Tue Jun 30 14:24:29 2015 -0400 +++ b/vm-heap-analysis/command/src/test/java/com/redhat/thermostat/vm/heap/analysis/command/internal/SaveHeapDumpToFileCommandTest.java Tue Jun 30 15:04:55 2015 -0400 @@ -50,6 +50,7 @@ import org.junit.Before; import org.junit.Test; +import com.redhat.thermostat.common.cli.Arguments; import com.redhat.thermostat.common.cli.Command; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; @@ -77,8 +78,8 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", "host-id"); - args.addArgument("vmId", "1"); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "host-id"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "1"); args.addArgument("file", "heap-id-1"); HeapDAO heapDAO = mock(HeapDAO.class); @@ -93,8 +94,8 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", "host-id"); - args.addArgument("vmId", "1"); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "host-id"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "1"); args.addArgument("heapId", "heap-id-1"); HeapDAO heapDAO = mock(HeapDAO.class); @@ -139,8 +140,8 @@ TestCommandContextFactory factory = new TestCommandContextFactory(); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", "host-id"); - args.addArgument("vmId", "1"); + args.addArgument(Arguments.HOST_ID_ARGUMENT, "host-id"); + args.addArgument(Arguments.VM_ID_ARGUMENT, "1"); args.addArgument("heapId", "heap-id-1"); args.addArgument("file", "heap-id-1");
--- a/vm-profiler/client-cli/src/test/java/com/redhat/thermostat/vm/profiler/client/cli/internal/ProfileVmCommandTest.java Tue Jun 30 14:24:29 2015 -0400 +++ b/vm-profiler/client-cli/src/test/java/com/redhat/thermostat/vm/profiler/client/cli/internal/ProfileVmCommandTest.java Tue Jun 30 15:04:55 2015 -0400 @@ -48,6 +48,7 @@ import com.redhat.thermostat.client.cli.internal.LocaleResources; import com.redhat.thermostat.client.command.RequestQueue; +import com.redhat.thermostat.common.cli.Arguments; import com.redhat.thermostat.common.cli.CommandContext; import com.redhat.thermostat.common.cli.CommandException; import com.redhat.thermostat.common.cli.SimpleArguments; @@ -101,8 +102,8 @@ @Test (expected=CommandException.class) public void needsSubCommand() throws Exception { SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", AGENT_ID); - args.addArgument("vmId", VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, AGENT_ID); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); CommandContext ctx = cmdCtxFactory.createContext(args); cmd.run(ctx); @@ -114,8 +115,8 @@ when(agentsDao.getAgentInformation(AGENT)).thenReturn(agentInfo); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", AGENT_ID); - args.addArgument("vmId", VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, AGENT_ID); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); args.addNonOptionArgument("status"); CommandContext ctx = cmdCtxFactory.createContext(args); @@ -133,8 +134,8 @@ when(profileDao.getLatestStatus(VM)).thenReturn(status); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", AGENT_ID); - args.addArgument("vmId", VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, AGENT_ID); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); args.addNonOptionArgument("status"); CommandContext ctx = cmdCtxFactory.createContext(args); @@ -149,8 +150,8 @@ when(agentsDao.getAgentInformation(AGENT)).thenReturn(agentInfo); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", AGENT_ID); - args.addArgument("vmId", VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, AGENT_ID); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); args.addNonOptionArgument("show"); CommandContext ctx = cmdCtxFactory.createContext(args); @@ -169,8 +170,8 @@ when(profileDao.loadLatestProfileData(VM)).thenReturn(in); SimpleArguments args = new SimpleArguments(); - args.addArgument("hostId", AGENT_ID); - args.addArgument("vmId", VM_ID); + args.addArgument(Arguments.HOST_ID_ARGUMENT, AGENT_ID); + args.addArgument(Arguments.VM_ID_ARGUMENT, VM_ID); args.addNonOptionArgument("show"); CommandContext ctx = cmdCtxFactory.createContext(args);