Mercurial > hg > thermostat-ng > agent
view plugins/vm-byteman/agent/src/main/java/com/redhat/thermostat/vm/byteman/agent/internal/VmBytemanDAOImpl.java @ 2780:0633f63d464d
Remove typeadapters and use JSONService
This patch removes most of the type adapters from the agent, and
replaces them with the JSONService from thermostat-common.
The version of thermostat-common is updated to 0.1.2, which supports the
current JSON expected by the web-gateway
Reviewed-by: neugens
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-October/025522.html
author | Simon Tooke <stooke@redhat.com> |
---|---|
date | Wed, 25 Oct 2017 12:53:20 -0400 |
parents | 6ea7021a74d6 |
children |
line wrap: on
line source
/* * 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.byteman.agent.internal; import com.redhat.thermostat.lang.schema.JSONService; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; import com.redhat.thermostat.agent.http.HttpRequestService; import com.redhat.thermostat.common.config.experimental.ConfigurationInfoSource; import com.redhat.thermostat.common.plugin.BackendConfigurationUtil; import com.redhat.thermostat.common.plugin.SystemID; import com.redhat.thermostat.vm.byteman.agent.BytemanMetric; import com.redhat.thermostat.vm.byteman.agent.VmBytemanDAO; import com.redhat.thermostat.vm.byteman.agent.VmBytemanStatus; @Component @Service(value = VmBytemanDAO.class) public class VmBytemanDAOImpl implements VmBytemanDAO { private static final String PLUGIN_ID = "vm-byteman"; private final ConfigurationCreator configCreator; @Reference private ConfigurationInfoSource configInfoSource; @Reference private HttpRequestService httpRequestService; @Reference private JSONService jsonService; @Reference private SystemID systemId; private VmBytemanMetricsStore metricsStore; private VmBytemanStatusStore statusStore; public VmBytemanDAOImpl() { this(new ConfigurationCreator()); } VmBytemanDAOImpl(ConfigurationCreator configCreator) { this.configCreator = configCreator; } @Activate private void activate() { BackendConfigurationUtil config = configCreator.create(configInfoSource); metricsStore = new VmBytemanMetricsStore(httpRequestService, config, systemId, jsonService); statusStore = new VmBytemanStatusStore(httpRequestService, config, systemId, jsonService); } @Override public void addMetric(final BytemanMetric metric) { metricsStore.put(metric); } @Override public void addBytemanStatus(final VmBytemanStatus status) { statusStore.put(status); } // For Testing purposes static class ConfigurationCreator { BackendConfigurationUtil create(ConfigurationInfoSource source) { return new BackendConfigurationUtil(source, PLUGIN_ID); } } }