From 18bbbaafbc7ae302f7e5aa0f9779c888fb21c8c5 Mon Sep 17 00:00:00 2001 From: Stefan Negrea Date: Thu, 18 Sep 2014 12:06:19 -0500 Subject: [PATCH] [BZ 1126410] Minor updates based on code review. (cherry picked from commit d1a36215cac49f8ce2e375b34f93aee0a1e2adfe) Signed-off-by: Jay Shaughnessy --- .../metrics/migrator/workers/MigrationTable.java | 10 +++++----- .../rhq/server/metrics/CassandraIntegrationTest.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/workers/MigrationTable.java b/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/workers/MigrationTable.java index a823ff9a97b..702dd9e1a3f 100644 --- a/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/workers/MigrationTable.java +++ b/modules/enterprise/server/data-migration/src/main/java/org/rhq/server/metrics/migrator/workers/MigrationTable.java @@ -1,8 +1,7 @@ /* * RHQ Management Platform - * Copyright 2013, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * Copyright (C) 2005-2014 Red Hat, Inc. + * All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,10 +13,11 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + package org.rhq.server.metrics.migrator.workers; import org.joda.time.Duration; diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java index 83ee2eacc29..d5cc5d3c828 100644 --- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java +++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java @@ -130,7 +130,7 @@ protected Iterable findAggregateMetrics(Bucket bucket, i String cql = "SELECT schedule_id, time, type, value " + "FROM " + MetricsTable.AGGREGATE + " " + - "WHERE schedule_id = ? AND bucket = ?" + + "WHERE schedule_id = ? AND bucket = ? " + "ORDER BY time, type"; PreparedStatement statement = session.prepare(cql); BoundStatement boundStatement = statement.bind(scheduleId, bucket.toString());