Mercurial > hg > thermostat-ng > agent
view plugins/host-overview/agent/src/main/java/com/redhat/thermostat/host/overview/internal/models/HostInfoDAOImpl.java @ 2749:ed2aca3cd482
Fix inadvertent test code in jvm-io plugin
Unfortunately, some test code got in to my vm-io plugin implementation.
This patch fixes that and enhances the test case.
Reviewed-by: sgehwolf
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-September/024878.html
author | Simon Tooke <stooke@redhat.com> |
---|---|
date | Thu, 07 Sep 2017 14:04:15 -0400 |
parents | 2b8ca1e3186d |
children | 6ea7021a74d6 |
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.host.overview.internal.models; import java.io.IOException; import java.net.URI; import java.util.Arrays; import java.util.List; import java.util.logging.Logger; 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.PluginConfiguration; import com.redhat.thermostat.common.plugin.PluginDAOBase; import com.redhat.thermostat.common.plugin.SystemID; import com.redhat.thermostat.common.utils.LoggingUtils; import com.redhat.thermostat.host.overview.model.HostInfo; import com.redhat.thermostat.host.overview.model.HostInfoTypeAdapter; @Component @Service(value = HostInfoDAO.class) public class HostInfoDAOImpl extends PluginDAOBase<HostInfo> implements HostInfoDAO { private static final Logger logger = LoggingUtils.getLogger(HostInfoDAOImpl.class); public static final String PLUGIN_ID = "host-overview"; private final JsonHelper jsonHelper; private final ConfigurationCreator configCreator; private PluginConfiguration config; @Reference private ConfigurationInfoSource configurationInfoSource; @Reference private HttpRequestService httpRequestService; @Reference private SystemID systemID; public HostInfoDAOImpl() { this(new JsonHelper(new HostInfoTypeAdapter()), new ConfigurationCreator()); } HostInfoDAOImpl(JsonHelper jh, ConfigurationCreator creator) { this.jsonHelper = jh; this.configCreator = creator; } @Activate void activate() throws Exception { this.config = configCreator.create(configurationInfoSource); } public URI getPostURI(final URI base, HostInfo obj) { return base.resolve("systems/" + systemID.getSystemID()); } public String getPluginId() { return PLUGIN_ID; } public Logger getLogger() { return logger; } @Override protected HttpRequestService getHttpRequestService() { return httpRequestService; } @Override protected String toJsonString(HostInfo obj) throws IOException { return jsonHelper.toJson(Arrays.asList(obj)); } @Override protected PluginConfiguration getConfig() { return config; } // DS bind method protected void bindSystemID(SystemID systemid) { this.systemID = systemid; } protected void bindConfigurationInfoSource(ConfigurationInfoSource cfg) { this.configurationInfoSource = cfg; } protected void bindHttpRequestService(HttpRequestService httpRequestService) { this.httpRequestService = httpRequestService; } protected void unbindHttpRequestService(HttpRequestService httpRequestService) { this.httpRequestService = null; } static class JsonHelper { private final HostInfoTypeAdapter typeAdapter; JsonHelper(HostInfoTypeAdapter typeAdapter) { this.typeAdapter = typeAdapter; } String toJson(List<HostInfo> infos) throws IOException { return typeAdapter.toJson(infos); } } // For Testing purposes static class ConfigurationCreator { PluginConfiguration create(ConfigurationInfoSource source) { return new PluginConfiguration(source, PLUGIN_ID); } } }