Mercurial > hg > thermostat-ng > agent
changeset 2659:fa39903816d6
Clean up unused Category/Key code in plugins.
Reviewed-By: ebaron
Review-Thread: http://icedtea.classpath.org/pipermail/thermostat/2017-May/023266.html
| author | Joshua Matsuoka <jmatsuok@redhat.com> |
|---|---|
| date | Thu, 25 May 2017 12:19:06 -0400 |
| parents | 4f1f13f48d0e |
| children | 301c7dcb6c80 |
| files | plugins/vm-gc/common/src/main/java/com/redhat/thermostat/vm/gc/common/VmGcStatDAO.java plugins/vm-gc/common/src/main/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatCategoryRegistration.java plugins/vm-gc/common/src/main/resources/META-INF/services/com.redhat.thermostat.storage.core.auth.CategoryRegistration plugins/vm-gc/common/src/main/resources/META-INF/services/com.redhat.thermostat.storage.core.auth.StatementDescriptorRegistration plugins/vm-gc/common/src/test/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatCategoryRegistrationTest.java plugins/vm-gc/common/src/test/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatDAOTest.java plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/VmMemoryStatDAO.java plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/VmTlabStatDAO.java plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatCategoryRegistration.java plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/internal/VmTlabStatCategoryRegistration.java plugins/vm-memory/common/src/main/resources/META-INF/services/com.redhat.thermostat.storage.core.auth.CategoryRegistration plugins/vm-memory/common/src/main/resources/META-INF/services/com.redhat.thermostat.storage.core.auth.StatementDescriptorRegistration plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatCategoryRegistrationTest.java plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatDAOTest.java plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmTlabStatDAOTest.java |
| diffstat | 15 files changed, 0 insertions(+), 418 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/vm-gc/common/src/main/java/com/redhat/thermostat/vm/gc/common/VmGcStatDAO.java Wed May 24 12:13:27 2017 +0200 +++ b/plugins/vm-gc/common/src/main/java/com/redhat/thermostat/vm/gc/common/VmGcStatDAO.java Thu May 25 12:19:06 2017 -0400 @@ -36,30 +36,12 @@ package com.redhat.thermostat.vm.gc.common; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - import com.redhat.thermostat.annotations.Service; -import com.redhat.thermostat.storage.core.AgentId; -import com.redhat.thermostat.storage.core.Category; -import com.redhat.thermostat.storage.core.Key; -import com.redhat.thermostat.storage.core.VmId; -import com.redhat.thermostat.storage.core.VmRef; import com.redhat.thermostat.vm.gc.common.model.VmGcStat; @Service public interface VmGcStatDAO { - static final Key<String> collectorKey = new Key<>("collectorName"); - static final Key<Long> runCountKey = new Key<>("runCount"); - /** time in microseconds */ - static final Key<Long> wallTimeKey = new Key<>("wallTime"); - - static final Category<VmGcStat> vmGcStatCategory = new Category<>("vm-gc-stats", VmGcStat.class, - Arrays.<Key<?>>asList(Key.AGENT_ID, Key.VM_ID, Key.TIMESTAMP, collectorKey, runCountKey, wallTimeKey), - Arrays.<Key<?>>asList(Key.TIMESTAMP)); - public void putVmGcStat(VmGcStat stat); }
--- a/plugins/vm-gc/common/src/main/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatCategoryRegistration.java Wed May 24 12:13:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* - * Copyright 2012-2017 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * <http://www.gnu.org/licenses/>. - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.vm.gc.common.internal; - -import java.util.HashSet; -import java.util.Set; - -import com.redhat.thermostat.storage.core.auth.CategoryRegistration; -import com.redhat.thermostat.vm.gc.common.VmGcStatDAO; - -/** - * Registers the category used by this maven module. The web storage - * endpoint only allows categories to be registered which it knows of - * ahead of time. - * - */ -public class VmGcStatCategoryRegistration implements CategoryRegistration { - - @Override - public Set<String> getCategoryNames() { - Set<String> categories = new HashSet<>(1); - categories.add(VmGcStatDAO.vmGcStatCategory.getName()); - return categories; - } - -} -
--- a/plugins/vm-gc/common/src/main/resources/META-INF/services/com.redhat.thermostat.storage.core.auth.CategoryRegistration Wed May 24 12:13:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -com.redhat.thermostat.vm.gc.common.internal.VmGcStatCategoryRegistration \ No newline at end of file
--- a/plugins/vm-gc/common/src/main/resources/META-INF/services/com.redhat.thermostat.storage.core.auth.StatementDescriptorRegistration Wed May 24 12:13:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -com.redhat.thermostat.vm.gc.common.internal.VmGcStatDAOImplStatementDescriptorRegistration \ No newline at end of file
--- a/plugins/vm-gc/common/src/test/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatCategoryRegistrationTest.java Wed May 24 12:13:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/* - * Copyright 2012-2017 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * <http://www.gnu.org/licenses/>. - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.vm.gc.common.internal; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Set; - -import org.junit.Test; - -import com.redhat.thermostat.storage.core.auth.CategoryRegistration; -import com.redhat.thermostat.testutils.ServiceLoaderTest; -import com.redhat.thermostat.vm.gc.common.VmGcStatDAO; - -public class VmGcStatCategoryRegistrationTest extends ServiceLoaderTest<CategoryRegistration> { - - public VmGcStatCategoryRegistrationTest() { - super(CategoryRegistration.class, STORAGE_SERVICES, VmGcStatCategoryRegistration.class); - } - - @Test - public void registersAllCategories() { - VmGcStatCategoryRegistration reg = new VmGcStatCategoryRegistration(); - Set<String> categories = reg.getCategoryNames(); - assertEquals(1, categories.size()); - assertFalse("null descriptor not allowed", categories.contains(null)); - assertTrue(categories.contains(VmGcStatDAO.vmGcStatCategory.getName())); - } - -} -
--- a/plugins/vm-gc/common/src/test/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatDAOTest.java Wed May 24 12:13:27 2017 +0200 +++ b/plugins/vm-gc/common/src/test/java/com/redhat/thermostat/vm/gc/common/internal/VmGcStatDAOTest.java Thu May 25 12:19:06 2017 -0400 @@ -119,19 +119,5 @@ verify(response).getStatus(); } - @Test - public void testCategory() { - assertEquals("vm-gc-stats", VmGcStatDAO.vmGcStatCategory.getName()); - Collection<Key<?>> keys = VmGcStatDAO.vmGcStatCategory.getKeys(); - assertTrue(keys.contains(new Key<>("agentId"))); - assertTrue(keys.contains(new Key<Integer>("vmId"))); - assertTrue(keys.contains(new Key<Long>("timeStamp"))); - assertTrue(keys.contains(new Key<String>("collectorName"))); - assertTrue(keys.contains(new Key<Long>("runCount"))); - assertTrue(keys.contains(new Key<Long>("wallTime"))); - assertEquals(6, keys.size()); - } - - }
--- a/plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/VmMemoryStatDAO.java Wed May 24 12:13:27 2017 +0200 +++ b/plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/VmMemoryStatDAO.java Thu May 25 12:19:06 2017 -0400 @@ -40,29 +40,11 @@ import java.util.List; import com.redhat.thermostat.annotations.Service; -import com.redhat.thermostat.storage.core.AgentId; -import com.redhat.thermostat.storage.core.Category; -import com.redhat.thermostat.storage.core.Key; -import com.redhat.thermostat.storage.core.VmId; -import com.redhat.thermostat.storage.core.VmRef; import com.redhat.thermostat.vm.memory.common.model.VmMemoryStat; -import com.redhat.thermostat.vm.memory.common.model.VmMemoryStat.Generation; @Service public interface VmMemoryStatDAO { - static final Key<Generation[]> generationsKey = new Key<>("generations"); - static final Key<Long> KEY_METASPACE_MAX_CAPACITY = new Key<>("metaspaceMaxCapacity"); - static final Key<Long> KEY_METASPACE_MIN_CAPACITY = new Key<>("metaspaceMinCapacity"); - static final Key<Long> KEY_METASPACE_CAPACITY = new Key<>("metaspaceCapacity"); - static final Key<Long> KEY_METASPACE_USED = new Key<>("metaspaceUsed"); - - static final Category<VmMemoryStat> vmMemoryStatsCategory = new Category<>("vm-memory-stats", VmMemoryStat.class, - Arrays.<Key<?>>asList(Key.AGENT_ID, Key.VM_ID, Key.TIMESTAMP, - KEY_METASPACE_MAX_CAPACITY, KEY_METASPACE_MIN_CAPACITY, KEY_METASPACE_CAPACITY, KEY_METASPACE_USED, - generationsKey), - Arrays.<Key<?>>asList(Key.TIMESTAMP)); - public void putVmMemoryStat(VmMemoryStat stat); }
--- a/plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/VmTlabStatDAO.java Wed May 24 12:13:27 2017 +0200 +++ b/plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/VmTlabStatDAO.java Thu May 25 12:19:06 2017 -0400 @@ -36,43 +36,12 @@ package com.redhat.thermostat.vm.memory.common; -import java.util.Arrays; -import java.util.List; - import com.redhat.thermostat.annotations.Service; -import com.redhat.thermostat.storage.core.AgentId; -import com.redhat.thermostat.storage.core.Category; -import com.redhat.thermostat.storage.core.Key; -import com.redhat.thermostat.storage.core.VmId; -import com.redhat.thermostat.storage.core.VmRef; import com.redhat.thermostat.vm.memory.common.model.VmTlabStat; @Service public interface VmTlabStatDAO { - static final Key<Long> KEY_TOTAL_ALLOCATING_THREADS = new Key<>("totalAllocatingThreads"); - static final Key<Long> KEY_TOTAL_ALLOCATIONS = new Key<>("totalAllocations"); - static final Key<Long> KEY_TOTAL_REFILLS = new Key<>("totalRefills"); - static final Key<Long> KEY_MAX_REFILLS = new Key<>("maxRefills"); - static final Key<Long> KEY_TOTAL_SLOW_ALLOCATIONS = new Key<>("totalSlowAllocations"); - static final Key<Long> KEY_MAX_SLOW_ALLOCATIONS = new Key<>("maxSlowAllocations"); - static final Key<Long> KEY_TOTAL_GC_WASTE = new Key<>("totalGcWaste"); - static final Key<Long> KEY_MAX_GC_WASTE = new Key<>("maxGcWaste"); - static final Key<Long> KEY_TOTAL_SLOW_WASTE = new Key<>("totalSlowWaste"); - static final Key<Long> KEY_MAX_SLOW_WASTE = new Key<>("maxSlowWaste"); - static final Key<Long> KEY_TOTAL_FAST_WASTE = new Key<>("totalFastWaste"); - static final Key<Long> KEY_MAX_FAST_WASTE = new Key<>("maxFastWaste"); - - static final Category<VmTlabStat> vmTlabStatsCategory = new Category<>("vm-tlab-stats", VmTlabStat.class, - Arrays.<Key<?>>asList(Key.AGENT_ID, Key.VM_ID, Key.TIMESTAMP, - KEY_TOTAL_ALLOCATING_THREADS, KEY_TOTAL_ALLOCATIONS, - KEY_TOTAL_REFILLS, KEY_MAX_REFILLS, - KEY_TOTAL_SLOW_ALLOCATIONS, KEY_MAX_SLOW_ALLOCATIONS, - KEY_TOTAL_GC_WASTE, KEY_MAX_GC_WASTE, - KEY_TOTAL_SLOW_WASTE, KEY_MAX_SLOW_WASTE, - KEY_TOTAL_FAST_WASTE, KEY_MAX_FAST_WASTE), - Arrays.<Key<?>>asList(Key.TIMESTAMP)); - public void putStat(VmTlabStat stat); }
--- a/plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatCategoryRegistration.java Wed May 24 12:13:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -/* - * Copyright 2012-2017 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * <http://www.gnu.org/licenses/>. - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.vm.memory.common.internal; - -import java.util.HashSet; -import java.util.Set; - -import com.redhat.thermostat.storage.core.auth.CategoryRegistration; -import com.redhat.thermostat.vm.memory.common.VmMemoryStatDAO; - -/** - * Registers the category used by this maven module. The web storage - * endpoint only allows categories to be registered which it knows of - * ahead of time. - * - */ -public class VmMemoryStatCategoryRegistration implements CategoryRegistration { - - @Override - public Set<String> getCategoryNames() { - Set<String> categories = new HashSet<>(1); - categories.add(VmMemoryStatDAO.vmMemoryStatsCategory.getName()); - return categories; - } - -} -
--- a/plugins/vm-memory/common/src/main/java/com/redhat/thermostat/vm/memory/common/internal/VmTlabStatCategoryRegistration.java Wed May 24 12:13:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/* - * Copyright 2012-2017 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * <http://www.gnu.org/licenses/>. - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.vm.memory.common.internal; - -import java.util.HashSet; -import java.util.Set; - -import com.redhat.thermostat.storage.core.auth.CategoryRegistration; -import com.redhat.thermostat.vm.memory.common.VmTlabStatDAO; - -public class VmTlabStatCategoryRegistration implements CategoryRegistration { - - @Override - public Set<String> getCategoryNames() { - Set<String> categories = new HashSet<>(1); - categories.add(VmTlabStatDAO.vmTlabStatsCategory.getName()); - return categories; - } - -} -
--- a/plugins/vm-memory/common/src/main/resources/META-INF/services/com.redhat.thermostat.storage.core.auth.CategoryRegistration Wed May 24 12:13:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -com.redhat.thermostat.vm.memory.common.internal.VmMemoryStatCategoryRegistration -com.redhat.thermostat.vm.memory.common.internal.VmTlabStatCategoryRegistration
--- a/plugins/vm-memory/common/src/main/resources/META-INF/services/com.redhat.thermostat.storage.core.auth.StatementDescriptorRegistration Wed May 24 12:13:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -com.redhat.thermostat.vm.memory.common.internal.VmMemoryStatDAOImplStatementDescriptorRegistration -com.redhat.thermostat.vm.memory.common.internal.VmTlabStatDAOImplStatementDescriptorRegistration
--- a/plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatCategoryRegistrationTest.java Wed May 24 12:13:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/* - * Copyright 2012-2017 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * <http://www.gnu.org/licenses/>. - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.vm.memory.common.internal; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Set; - -import org.junit.Test; - -import com.redhat.thermostat.storage.core.auth.CategoryRegistration; -import com.redhat.thermostat.testutils.ServiceLoaderTest; -import com.redhat.thermostat.vm.memory.common.VmMemoryStatDAO; - -public class VmMemoryStatCategoryRegistrationTest extends ServiceLoaderTest<CategoryRegistration> { - - public VmMemoryStatCategoryRegistrationTest() { - super(CategoryRegistration.class, STORAGE_SERVICES + 1 /* tlab */, VmMemoryStatCategoryRegistration.class); - } - - @Test - public void registersAllCategories() { - VmMemoryStatCategoryRegistration reg = new VmMemoryStatCategoryRegistration(); - Set<String> categories = reg.getCategoryNames(); - assertEquals(1, categories.size()); - assertFalse("null descriptor not allowed", categories.contains(null)); - assertTrue(categories.contains(VmMemoryStatDAO.vmMemoryStatsCategory.getName())); - } - -} -
--- a/plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatDAOTest.java Wed May 24 12:13:27 2017 +0200 +++ b/plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmMemoryStatDAOTest.java Thu May 25 12:19:06 2017 -0400 @@ -98,23 +98,6 @@ when(jsonHelper.toJson(anyListOf(VmMemoryStat.class))).thenReturn(JSON); } - @Test - public void testCategories() { - Collection<Key<?>> keys; - - assertEquals("vm-memory-stats", VmMemoryStatDAO.vmMemoryStatsCategory.getName()); - keys = VmMemoryStatDAO.vmMemoryStatsCategory.getKeys(); - assertTrue(keys.contains(new Key<>("agentId"))); - assertTrue(keys.contains(new Key<Integer>("vmId"))); - assertTrue(keys.contains(new Key<Long>("timeStamp"))); - assertTrue(keys.contains(new Key<Long>("metaspaceMaxCapacity"))); - assertTrue(keys.contains(new Key<Long>("metaspaceMinCapacity"))); - assertTrue(keys.contains(new Key<Long>("metaspaceCapacity"))); - assertTrue(keys.contains(new Key<Long>("metaspaceUsed"))); - assertTrue(keys.contains(new Key<Generation[]>("generations"))); - assertEquals(8, keys.size()); - } - @SuppressWarnings("unchecked") @Test public void testPutVmMemoryStat() throws Exception {
--- a/plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmTlabStatDAOTest.java Wed May 24 12:13:27 2017 +0200 +++ b/plugins/vm-memory/common/src/test/java/com/redhat/thermostat/vm/memory/common/internal/VmTlabStatDAOTest.java Thu May 25 12:19:06 2017 -0400 @@ -58,9 +58,6 @@ import static com.redhat.thermostat.vm.memory.common.internal.VmTlabStatDAOImpl.HttpHelper; import static com.redhat.thermostat.vm.memory.common.internal.VmTlabStatDAOImpl.JsonHelper; -/** - * Created by jmatsuok on 03/05/17. - */ public class VmTlabStatDAOTest { private HttpClient httpClient;