# HG changeset patch # User Simon Tooke # Date 1502893681 14400 # Node ID 9cca55959e18d5f0fdd9efcb7f6b6ed5ddcc17c0 # Parent 08726e4b6d43a06f824f37331460af4a2f659512 Rename some POJO members in preparation for auto typeadapters This patch rename some members for our existing services to be conformant to the JSON names transmitted to the web-gateway. With the name changes, automatically generated type adapters and schema generation should work properly. Examples: vmId -> jvmId or timetamp -> timeStamp, etc. diff -r 08726e4b6d43 -r 9cca55959e18 integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java --- a/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java Fri Aug 11 14:03:38 2017 -0400 +++ b/integration-tests/itest-run/src/test/java/com/redhat/thermostat/itest/WebAppTest.java Wed Aug 16 10:28:01 2017 -0400 @@ -668,7 +668,7 @@ // gets registered automatically for that reason, no need to do it // manually for this test. String strDesc = "ADD vm-class-stats SET 'agentId' = ?s , " + - "'vmId' = ?s , " + + "'jvmId' = ?s , " + "'timeStamp' = ?l , " + "'loadedClasses' = ?l , " + "'loadedBytes' = ?l , " + diff -r 08726e4b6d43 -r 9cca55959e18 plugins/host-network/agent/src/main/java/com/redhat/thermostat/host/network/model/NetworkInterfaceInfo.java --- a/plugins/host-network/agent/src/main/java/com/redhat/thermostat/host/network/model/NetworkInterfaceInfo.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/host-network/agent/src/main/java/com/redhat/thermostat/host/network/model/NetworkInterfaceInfo.java Wed Aug 16 10:28:01 2017 -0400 @@ -44,26 +44,26 @@ @Entity public class NetworkInterfaceInfo { - private String iFace; + private String interfaceName; private String displayName; private String ip4Addr; private String ip6Addr; public NetworkInterfaceInfo(String iFace) { - this.iFace = iFace; + this.interfaceName = iFace; this.ip4Addr = null; this.ip6Addr = null; } @Persist public String getInterfaceName() { - return iFace; + return interfaceName; } @Persist public void setInterfaceName(String iFace) { - this.iFace = iFace; + this.interfaceName = iFace; } @Persist @@ -106,7 +106,7 @@ @Override public int hashCode() { - return Objects.hash(iFace, ip4Addr, ip6Addr); + return Objects.hash(interfaceName, ip4Addr, ip6Addr); } @Override @@ -118,7 +118,7 @@ if (getClass() != obj.getClass()) return false; NetworkInterfaceInfo other = (NetworkInterfaceInfo) obj; - return Objects.equals(iFace, other.iFace) && Objects.equals(ip4Addr, other.ip4Addr) + return Objects.equals(interfaceName, other.interfaceName) && Objects.equals(ip4Addr, other.ip4Addr) && Objects.equals(ip6Addr, other.ip6Addr); } } diff -r 08726e4b6d43 -r 9cca55959e18 plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/internal/model/VmInfoTypeAdapter.java --- a/plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/internal/model/VmInfoTypeAdapter.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/internal/model/VmInfoTypeAdapter.java Wed Aug 16 10:28:01 2017 -0400 @@ -51,16 +51,16 @@ public class VmInfoTypeAdapter extends TypeAdapter> { private static final String AGENT_ID = "agentId"; - private static final String VM_ID = "jvmId"; - private static final String VM_PID = "jvmPid"; + private static final String JVM_ID = "jvmId"; + private static final String JVM_PID = "jvmPid"; private static final String JAVA_VERSION = "javaVersion"; private static final String JAVA_HOME = "javaHome"; private static final String MAIN_CLASS = "mainClass"; private static final String JAVA_COMMAND_LINE = "javaCommandLine"; - private static final String VM_ARGUMENTS = "jvmArguments"; - private static final String VM_NAME = "jvmName"; - private static final String VM_INFO = "jvmInfo"; - private static final String VM_VERSION = "jvmVersion"; + private static final String JVM_ARGUMENTS = "jvmArguments"; + private static final String JVM_NAME = "jvmName"; + private static final String JVM_INFO = "jvmInfo"; + private static final String JVM_VERSION = "jvmVersion"; private static final String PROPERTIES_AS_ARRAY = "properties"; private static final String ENVIRONMENT_AS_ARRAY = "environment"; private static final String LOADED_NATIVE_LIBRARIES = "loadedNativeLibraries"; @@ -90,10 +90,10 @@ // Write each field of VmInfo as part of a JSON object out.name(AGENT_ID); out.value(info.getAgentId()); - out.name(VM_ID); - out.value(info.getVmId()); - out.name(VM_PID); - out.value(info.getVmPid()); + out.name(JVM_ID); + out.value(info.getJvmId()); + out.name(JVM_PID); + out.value(info.getJvmPid()); out.name(START_TIME_STAMP); writeLong(out, info.getStartTimeStamp()); out.name(STOP_TIME_STAMP); @@ -106,14 +106,14 @@ out.value(info.getMainClass()); out.name(JAVA_COMMAND_LINE); out.value(info.getJavaCommandLine()); - out.name(VM_NAME); - out.value(info.getVmName()); - out.name(VM_ARGUMENTS); - out.value(info.getVmArguments()); - out.name(VM_INFO); - out.value(info.getVmInfo()); - out.name(VM_VERSION); - out.value(info.getVmVersion()); + out.name(JVM_NAME); + out.value(info.getJvmName()); + out.name(JVM_ARGUMENTS); + out.value(info.getJvmArguments()); + out.name(JVM_INFO); + out.value(info.getJvmInfo()); + out.name(JVM_VERSION); + out.value(info.getJvmVersion()); out.name(PROPERTIES_AS_ARRAY); writeStringMap(out, info.getProperties()); out.name(ENVIRONMENT_AS_ARRAY); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/model/VmInfo.java --- a/plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/model/VmInfo.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/model/VmInfo.java Wed Aug 16 10:28:01 2017 -0400 @@ -97,18 +97,18 @@ } - private String vmId; - private int vmPid = 0; + private String jvmId; + private int jvmPid = 0; private long startTime = System.currentTimeMillis(); private long stopTime = Long.MIN_VALUE; private String javaVersion = "unknown"; private String javaHome = "unknown"; private String javaCommandLine = "unknown"; private String mainClass = "unknown"; - private String vmName = "unknown"; - private String vmInfo = "unknown"; - private String vmVersion = "unknown"; - private String vmArguments = "unknown"; + private String jvmName = "unknown"; + private String jvmInfo = "unknown"; + private String jvmVersion = "unknown"; + private String jvmArguments = "unknown"; private Map properties = new HashMap(); private Map environment = new HashMap(); private String[] loadedNativeLibraries; @@ -121,24 +121,24 @@ } public VmInfo(String writerId, String vmId, int vmPid, long startTime, long stopTime, - String javaVersion, String javaHome, - String mainClass, String commandLine, - String vmName, String vmInfo, String vmVersion, String vmArguments, - Map properties, Map environment, String[] loadedNativeLibraries, - long uid, String username) { + String javaVersion, String javaHome, + String mainClass, String commandLine, + String jvmName, String vmInfo, String vmVersion, String jvmArguments, + Map properties, Map environment, String[] loadedNativeLibraries, + long uid, String username) { super(writerId); - this.vmId = vmId; - this.vmPid = vmPid; + this.jvmId = vmId; + this.jvmPid = vmPid; this.startTime = startTime; this.stopTime = stopTime; this.javaVersion = javaVersion; this.javaHome = javaHome; this.mainClass = mainClass; this.javaCommandLine = commandLine; - this.vmName = vmName; - this.vmInfo = vmInfo; - this.vmVersion = vmVersion; - this.vmArguments = vmArguments; + this.jvmName = jvmName; + this.jvmInfo = vmInfo; + this.jvmVersion = vmVersion; + this.jvmArguments = jvmArguments; this.properties = properties; this.environment = environment; this.loadedNativeLibraries = loadedNativeLibraries; @@ -147,23 +147,23 @@ } @Persist - public String getVmId() { - return vmId; + public String getJvmId() { + return jvmId; } @Persist - public void setVmId(String vmId) { - this.vmId = vmId; + public void setJvmId(String jvmId) { + this.jvmId = jvmId; } @Persist - public int getVmPid() { - return vmPid; + public int getJvmPid() { + return jvmPid; } @Persist - public void setVmPid(int vmPid) { - this.vmPid = vmPid; + public void setJvmPid(int jvmPid) { + this.jvmPid = jvmPid; } @Persist @@ -231,43 +231,43 @@ } @Persist - public String getVmName() { - return vmName; + public String getJvmName() { + return jvmName; } @Persist - public void setVmName(String vmName) { - this.vmName = vmName; + public void setJvmName(String jvmName) { + this.jvmName = jvmName; } @Persist - public String getVmArguments() { - return vmArguments; + public String getJvmArguments() { + return jvmArguments; } @Persist - public void setVmArguments(String vmArguments) { - this.vmArguments = vmArguments; + public void setJvmArguments(String jvmArguments) { + this.jvmArguments = jvmArguments; } @Persist - public String getVmInfo() { - return vmInfo; + public String getJvmInfo() { + return jvmInfo; } @Persist - public void setVmInfo(String vmInfo) { - this.vmInfo = vmInfo; + public void setJvmInfo(String jvmInfo) { + this.jvmInfo = jvmInfo; } @Persist - public String getVmVersion() { - return vmVersion; + public String getJvmVersion() { + return jvmVersion; } @Persist - public void setVmVersion(String vmVersion) { - this.vmVersion = vmVersion; + public void setJvmVersion(String jvmVersion) { + this.jvmVersion = jvmVersion; } /** diff -r 08726e4b6d43 -r 9cca55959e18 plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/model/VmRef.java --- a/plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/model/VmRef.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/model/VmRef.java Wed Aug 16 10:28:01 2017 -0400 @@ -55,8 +55,8 @@ public VmRef(HostRef hostRef, VmInfo vmInfo) { this.hostRef = hostRef; - this.id = vmInfo.getVmId(); - this.pid = vmInfo.getVmPid(); + this.id = vmInfo.getJvmId(); + this.pid = vmInfo.getJvmPid(); this.name = vmInfo.getMainClass(); } diff -r 08726e4b6d43 -r 9cca55959e18 plugins/jvm-overview/agent/src/test/java/com/redhat/thermostat/jvm/overview/agent/internal/JvmStatHostListenerTest.java --- a/plugins/jvm-overview/agent/src/test/java/com/redhat/thermostat/jvm/overview/agent/internal/JvmStatHostListenerTest.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/jvm-overview/agent/src/test/java/com/redhat/thermostat/jvm/overview/agent/internal/JvmStatHostListenerTest.java Wed Aug 16 10:28:01 2017 -0400 @@ -259,17 +259,17 @@ final long INFO_STOPTIME = Long.MAX_VALUE; VmInfo info = hostListener.createVmInfo(INFO_ID, INFO_PID, INFO_STOPTIME, extractor); - assertEquals(INFO_PID, info.getVmPid()); + assertEquals(INFO_PID, info.getJvmPid()); assertEquals(INFO_STARTTIME, info.getStartTimeStamp()); assertEquals(INFO_STOPTIME, info.getStopTimeStamp()); assertEquals(INFO_CMDLINE, info.getJavaCommandLine()); assertEquals(INFO_JAVAHOME, info.getJavaHome()); assertEquals(INFO_JAVAVER, info.getJavaVersion()); assertEquals(INFO_MAINCLASS, info.getMainClass()); - assertEquals(INFO_VMARGS, info.getVmArguments()); - assertEquals(INFO_VMINFO, info.getVmInfo()); - assertEquals(INFO_VMNAME, info.getVmName()); - assertEquals(INFO_VMVER, info.getVmVersion()); + assertEquals(INFO_VMARGS, info.getJvmArguments()); + assertEquals(INFO_VMINFO, info.getJvmInfo()); + assertEquals(INFO_VMNAME, info.getJvmName()); + assertEquals(INFO_VMVER, info.getJvmVersion()); assertEquals(INFO_VMUSERID, info.getUid()); assertEquals(INFO_VMUSERNAME, info.getUsername()); } diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-gc/agent/src/main/java/com/redhat/thermostat/vm/gc/agent/internal/models/VmGcStatTypeAdapter.java --- a/plugins/vm-gc/agent/src/main/java/com/redhat/thermostat/vm/gc/agent/internal/models/VmGcStatTypeAdapter.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-gc/agent/src/main/java/com/redhat/thermostat/vm/gc/agent/internal/models/VmGcStatTypeAdapter.java Wed Aug 16 10:28:01 2017 -0400 @@ -48,7 +48,7 @@ private static final String TYPE_LONG = "$numberLong"; private static final String AGENT_ID = "agentId"; - private static final String VM_ID = "jvmId"; + private static final String JVM_ID = "jvmId"; private static final String TIMESTAMP = "timeStamp"; private static final String COLLECTOR_NAME = "collectorName"; private static final String RUN_COUNT = "runCount"; @@ -72,8 +72,8 @@ out.beginObject(); out.name(AGENT_ID); out.value(stat.getAgentId()); - out.name(VM_ID); - out.value(stat.getVmId()); + out.name(JVM_ID); + out.value(stat.getJvmId()); out.name(TIMESTAMP); writeLong(out, stat.getTimeStamp()); out.name(COLLECTOR_NAME); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-gc/agent/src/main/java/com/redhat/thermostat/vm/gc/agent/model/VmGcStat.java --- a/plugins/vm-gc/agent/src/main/java/com/redhat/thermostat/vm/gc/agent/model/VmGcStat.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-gc/agent/src/main/java/com/redhat/thermostat/vm/gc/agent/model/VmGcStat.java Wed Aug 16 10:28:01 2017 -0400 @@ -45,7 +45,7 @@ public class VmGcStat extends BasePojo implements TimeStampedPojo { private long timeStamp; - private String vmId; + private String jvmId; private String collectorName; private long runCount; private long wallTimeInMicros; @@ -54,23 +54,23 @@ super(null); } - public VmGcStat(String writerId, String vmId, long timestamp, String collectorName, long runCount, long wallTimeInMicros) { + public VmGcStat(String writerId, String jvmId, long timestamp, String collectorName, long runCount, long wallTimeInMicros) { super(writerId); this.timeStamp = timestamp; - this.vmId = vmId; + this.jvmId = jvmId; this.collectorName = collectorName; this.runCount = runCount; this.wallTimeInMicros = wallTimeInMicros; } @Persist - public String getVmId() { - return vmId; + public String getJvmId() { + return jvmId; } @Persist - public void setVmId(String vmId) { - this.vmId = vmId; + public void setJvmId(String jvmId) { + this.jvmId = jvmId; } @Persist diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-gc/agent/src/test/java/com/redhat/thermostat/vm/gc/agent/internal/models/VmGcStatDAOImplTest.java --- a/plugins/vm-gc/agent/src/test/java/com/redhat/thermostat/vm/gc/agent/internal/models/VmGcStatDAOImplTest.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-gc/agent/src/test/java/com/redhat/thermostat/vm/gc/agent/internal/models/VmGcStatDAOImplTest.java Wed Aug 16 10:28:01 2017 -0400 @@ -74,7 +74,7 @@ stat.setTimeStamp(1234l); stat.setWallTime(4000l); stat.setRunCount(1000l); - stat.setVmId("Vm-1"); + stat.setJvmId("Vm-1"); stat.setCollectorName("Collector"); jsonHelper = mock(JsonHelper.class); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-gc/agent/src/test/java/com/redhat/thermostat/vm/gc/agent/internal/models/VmGcStatTypeAdapterTest.java --- a/plugins/vm-gc/agent/src/test/java/com/redhat/thermostat/vm/gc/agent/internal/models/VmGcStatTypeAdapterTest.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-gc/agent/src/test/java/com/redhat/thermostat/vm/gc/agent/internal/models/VmGcStatTypeAdapterTest.java Wed Aug 16 10:28:01 2017 -0400 @@ -51,7 +51,7 @@ VmGcStatTypeAdapter typeAdapter = new VmGcStatTypeAdapter(); VmGcStat stat = new VmGcStat(); stat.setAgentId("1"); - stat.setVmId("2"); + stat.setJvmId("2"); stat.setTimeStamp(100l); stat.setCollectorName("Collector"); stat.setRunCount(10l); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmMemoryStatTypeAdapter.java --- a/plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmMemoryStatTypeAdapter.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmMemoryStatTypeAdapter.java Wed Aug 16 10:28:01 2017 -0400 @@ -52,7 +52,7 @@ private static final String GENERATIONS = "generations"; private static final String TIMESTAMP = "timeStamp"; private static final String AGENT_ID = "agentId"; - private static final String VM_ID = "jvmId"; + private static final String JVM_ID = "jvmId"; private static final String METASPACE_MAX_CAPACITY = "metaspaceMaxCapacity"; private static final String METASPACE_MIN_CAPACITY = "metaspaceMinCapacity"; private static final String METASPACE_CAPACITY = "metaspaceCapacity"; @@ -84,8 +84,8 @@ out.beginObject(); out.name(AGENT_ID); out.value(stat.getAgentId()); - out.name(VM_ID); - out.value(stat.getVmId()); + out.name(JVM_ID); + out.value(stat.getJvmId()); out.name(TIMESTAMP); writeLong(out, stat.getTimeStamp()); out.name(METASPACE_MAX_CAPACITY); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmTlabStatTypeAdapter.java --- a/plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmTlabStatTypeAdapter.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmTlabStatTypeAdapter.java Wed Aug 16 10:28:01 2017 -0400 @@ -47,7 +47,7 @@ public class VmTlabStatTypeAdapter extends TypeAdapter> { private static final String AGENT_ID = "agentId"; - private static final String VM_ID = "vmId"; + private static final String JVM_ID = "jvmId"; private static final String TIMESTAMP = "timeStamp"; private static final String ALLOC_THREADS = "allocThreads"; private static final String TOTAL_ALLOCATIONS = "totalAllocations"; @@ -79,8 +79,8 @@ public void writeStat(JsonWriter out, VmTlabStat stat) throws IOException { out.beginObject(); - out.name(VM_ID); - out.value(stat.getVmId()); + out.name(JVM_ID); + out.value(stat.getJvmId()); out.name(AGENT_ID); out.value(stat.getAgentId()); out.name(TIMESTAMP); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/model/VmMemoryStat.java --- a/plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/model/VmMemoryStat.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/model/VmMemoryStat.java Wed Aug 16 10:28:01 2017 -0400 @@ -180,8 +180,8 @@ } private Generation[] generations; - private long timestamp; - private String vmId; + private long timeStamp; + private String jvmId; private long metaspaceMaxCapacity; private long metaspaceMinCapacity; private long metaspaceCapacity; @@ -191,11 +191,11 @@ this(null, UNKNOWN, null, null, UNKNOWN, UNKNOWN, UNKNOWN, UNKNOWN); } - public VmMemoryStat(String writerId, long timestamp, String vmId, Generation[] generations, - long metaspaceMaxCapacity, long metaspaceMinCapacity, long metaspaceCapacity, long metaspaceUsed) { + public VmMemoryStat(String writerId, long timestamp, String jvmId, Generation[] generations, + long metaspaceMaxCapacity, long metaspaceMinCapacity, long metaspaceCapacity, long metaspaceUsed) { super(writerId); - this.timestamp = timestamp; - this.vmId = vmId; + this.timeStamp = timestamp; + this.jvmId = jvmId; if (generations != null) { this.generations = generations; } @@ -207,24 +207,24 @@ } @Persist - public String getVmId() { - return vmId; + public String getJvmId() { + return jvmId; } @Persist - public void setVmId(String vmId) { - this.vmId = vmId; + public void setJvmId(String jvmId) { + this.jvmId = jvmId; } @Persist @Override public long getTimeStamp() { - return timestamp; + return timeStamp; } @Persist public void setTimeStamp(long timeStamp) { - this.timestamp = timeStamp; + this.timeStamp = timeStamp; } @Persist diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/model/VmTlabStat.java --- a/plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/model/VmTlabStat.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-memory/agent/src/main/java/com/redhat/thermostat/vm/memory/agent/model/VmTlabStat.java Wed Aug 16 10:28:01 2017 -0400 @@ -49,7 +49,7 @@ public static final long UNKNOWN = -1; - private String vmId; + private String jvmId; private long timeStamp; private long allocThreads; @@ -75,7 +75,7 @@ super(null); } - public VmTlabStat(long timeStamp, String agentId, String vmId, + public VmTlabStat(long timeStamp, String agentId, String jvmId, long threadCount, long totalAllocations, long refills, long maxRefills, long slowAllocations, long maxSlowAllocations, @@ -83,7 +83,7 @@ long slowWaste, long maxSlowWaste, long fastWaste, long maxFastWaste) { super(agentId); - this.vmId = vmId; + this.jvmId = jvmId; this.timeStamp = timeStamp; this.allocThreads = threadCount; this.totalAllocations = totalAllocations; @@ -100,13 +100,13 @@ } @Persist - public String getVmId() { - return vmId; + public String getJvmId() { + return jvmId; } @Persist - public void setVmId(String vmId) { - this.vmId = vmId; + public void setJvmId(String jvmId) { + this.jvmId = jvmId; } @Persist diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/VmMemoryVmListenerTest.java --- a/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/VmMemoryVmListenerTest.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/VmMemoryVmListenerTest.java Wed Aug 16 10:28:01 2017 -0400 @@ -97,7 +97,7 @@ final int numGens = 2; vmMemoryStatDAO = mock(VmMemoryStatDAO.class); vmTlabStatDAO = mock(VmTlabStatDAO.class); - vmListener = new VmMemoryVmListener("foo-agent", vmMemoryStatDAO, vmTlabStatDAO, "vmId"); + vmListener = new VmMemoryVmListener("foo-agent", vmMemoryStatDAO, vmTlabStatDAO, "jvmId"); extractor = mock(VmMemoryDataExtractor.class); mockTotalGenerations(numGens); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmMemoryStatDAOImplTest.java --- a/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmMemoryStatDAOImplTest.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmMemoryStatDAOImplTest.java Wed Aug 16 10:28:01 2017 -0400 @@ -113,7 +113,7 @@ } gen.setSpaces(spaces.toArray(new Space[spaces.size()])); } - VmMemoryStat stat = new VmMemoryStat("foo-agent", 1, "vmId", generations.toArray(new Generation[generations.size()]), + VmMemoryStat stat = new VmMemoryStat("foo-agent", 1, "jvmId", generations.toArray(new Generation[generations.size()]), 2, 3, 4, 5); VmMemoryStatDAOImpl dao = new VmMemoryStatDAOImpl(jsonHelper, creator, source); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmMemoryStatTypeAdapterTest.java --- a/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmMemoryStatTypeAdapterTest.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmMemoryStatTypeAdapterTest.java Wed Aug 16 10:28:01 2017 -0400 @@ -53,7 +53,7 @@ VmMemoryStatTypeAdapter typeAdapter = new VmMemoryStatTypeAdapter(); VmMemoryStat stat = new VmMemoryStat(); stat.setTimeStamp(100l); - stat.setVmId("VM-1"); + stat.setJvmId("VM-1"); stat.setAgentId("AGENT-1"); stat.setMetaspaceCapacity(2000l); stat.setMetaspaceMaxCapacity(4096l); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmTlabStatDAOTest.java --- a/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmTlabStatDAOTest.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmTlabStatDAOTest.java Wed Aug 16 10:28:01 2017 -0400 @@ -119,7 +119,7 @@ VmTlabStat stat = new VmTlabStat(); stat.setAgentId(AGENT_ID); - stat.setVmId(VM_ID); + stat.setJvmId(VM_ID); stat.setTimeStamp(1000l); stat.setTotalAllocatingThreads(10l); stat.setTotalAllocations(1342l); diff -r 08726e4b6d43 -r 9cca55959e18 plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmTlabStatTypeAdapterTest.java --- a/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmTlabStatTypeAdapterTest.java Fri Aug 11 14:03:38 2017 -0400 +++ b/plugins/vm-memory/agent/src/test/java/com/redhat/thermostat/vm/memory/agent/internal/models/VmTlabStatTypeAdapterTest.java Wed Aug 16 10:28:01 2017 -0400 @@ -51,7 +51,7 @@ VmTlabStatTypeAdapter typeAdapter = new VmTlabStatTypeAdapter(); VmTlabStat stat = new VmTlabStat(); stat.setAgentId("AGENT-1"); - stat.setVmId("VM-1"); + stat.setJvmId("VM-1"); stat.setTimeStamp(1000l); stat.setTotalAllocatingThreads(10l); stat.setTotalAllocations(1342l); @@ -65,7 +65,7 @@ stat.setMaxSlowWaste(634l); stat.setTotalFastWaste(678l); stat.setMaxFastWaste(333l); - assertJsonEquals("[{\"vmId\":\"VM-1\",\"agentId\":\"AGENT-1\",\"timeStamp\":{\"$numberLong\":\"1000\"},\"allocThreads\":{\"$numberLong\":\"10\"},\"totalAllocations\":{\"$numberLong\":\"1342\"},\"refills\":{\"$numberLong\":\"58\"},\"maxRefills\":{\"$numberLong\":\"90\"},\"slowAllocations\":{\"$numberLong\":\"343\"},\"maxSlowAllocations\":{\"$numberLong\":\"989\"},\"gcWaste\":{\"$numberLong\":\"788\"},\"maxGcWaste\":{\"$numberLong\":\"992\"},\"slowWaste\":{\"$numberLong\":\"899\"},\"maxSlowWaste\":{\"$numberLong\":\"634\"},\"fastWaste\":{\"$numberLong\":\"678\"},\"maxFastWaste\":{\"$numberLong\":\"333\"}}]", typeAdapter.toJson(Arrays.asList(stat))); + assertJsonEquals("[{\"jvmId\":\"VM-1\",\"agentId\":\"AGENT-1\",\"timeStamp\":{\"$numberLong\":\"1000\"},\"allocThreads\":{\"$numberLong\":\"10\"},\"totalAllocations\":{\"$numberLong\":\"1342\"},\"refills\":{\"$numberLong\":\"58\"},\"maxRefills\":{\"$numberLong\":\"90\"},\"slowAllocations\":{\"$numberLong\":\"343\"},\"maxSlowAllocations\":{\"$numberLong\":\"989\"},\"gcWaste\":{\"$numberLong\":\"788\"},\"maxGcWaste\":{\"$numberLong\":\"992\"},\"slowWaste\":{\"$numberLong\":\"899\"},\"maxSlowWaste\":{\"$numberLong\":\"634\"},\"fastWaste\":{\"$numberLong\":\"678\"},\"maxFastWaste\":{\"$numberLong\":\"333\"}}]", typeAdapter.toJson(Arrays.asList(stat))); } }