Mercurial > hg > thermostat-ng > agent

changeset 1748:73496f1a1105

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unify AgentId and VmId by having them extend Id Move Id class from storage.core.experimental.statement to storage.core. Make AgentId and VmId extend this Id class. Update code generally to accomodate changes. PR2388 Reviewed-by: omajid, jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-June/013958.html
author James Aziz <jaziz@redhat.com>
date Mon, 08 Jun 2015 16:33:12 -0400
parents 8b4f0b573dbd
children d8be05852d5e
files storage/core/src/main/java/com/redhat/thermostat/storage/core/AgentId.java storage/core/src/main/java/com/redhat/thermostat/storage/core/Id.java storage/core/src/main/java/com/redhat/thermostat/storage/core/VmId.java storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/BeanAdapter.java storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/Criterion.java storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/Id.java storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/LimitCriterion.java storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/Query.java storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/QueryValues.java storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/SortCriterion.java storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/WhereCriterion.java storage/core/src/test/java/com/redhat/thermostat/storage/core/experimental/statement/BeanAdapterBuilderTest.java storage/core/src/test/java/com/redhat/thermostat/storage/core/experimental/statement/BeanAdapterTest.java storage/core/src/test/java/com/redhat/thermostat/storage/core/experimental/statement/QueryValuesTest.java thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/ThreadDaoImpl.java thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/statement/SessionQueries.java thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/statement/StateQueries.java thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/statement/SummaryQuery.java thread/collector/src/main/java/com/redhat/thermostat/thread/model/SessionID.java
diffstat 19 files changed, 108 insertions(+), 115 deletions(-) [+]
line wrap: on
line diff
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/AgentId.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/AgentId.java	Mon Jun 08 16:33:12 2015 -0400
@@ -37,32 +37,12 @@
 package com.redhat.thermostat.storage.core;
 
 /**
+ * This class uniquely identifies a Thermostat agent
  *
  */
-public class AgentId {
-    String uuid;
+public class AgentId extends Id {
 
     public AgentId(String id) {
-        this.uuid = id;
-    }
-
-    public String get() {
-        return uuid;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        AgentId agentId = (AgentId) o;
-
-        return uuid.equals(agentId.uuid);
-
-    }
-
-    @Override
-    public int hashCode() {
-        return uuid.hashCode();
+        super(id);
     }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/Id.java	Mon Jun 08 16:33:12 2015 -0400
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2012-2015 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.storage.core;
+
+import java.util.UUID;
+
+/**
+ *
+ */
+public class Id {
+    private String id;
+
+    public Id() {
+        id = UUID.randomUUID().toString();
+    }
+
+    public Id(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Id sessionID = (Id) o;
+
+        if (id != null ? !id.equals(sessionID.id) : sessionID.id != null)
+            return false;
+
+        return true;
+    }
+
+    public String get() {
+        return id;
+    }
+
+    @Override
+    public int hashCode() {
+        return id != null ? id.hashCode() : 0;
+    }
+}
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/VmId.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/VmId.java	Mon Jun 08 16:33:12 2015 -0400
@@ -37,16 +37,12 @@
 package com.redhat.thermostat.storage.core;
 
 /**
+ * This class uniquely identifies a Java Virtual Machine
  *
  */
-public class VmId {
-    String uuid;
+public class VmId extends Id {
 
     public VmId(String id) {
-        this.uuid = id;
-    }
-
-    public String get() {
-        return uuid;
+        super(id);
     }
 }
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/BeanAdapter.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/BeanAdapter.java	Mon Jun 08 16:33:12 2015 -0400
@@ -40,6 +40,7 @@
 import com.redhat.thermostat.storage.core.Category;
 import com.redhat.thermostat.storage.core.Cursor;
 import com.redhat.thermostat.storage.core.DescriptorParsingException;
+import com.redhat.thermostat.storage.core.Id;
 import com.redhat.thermostat.storage.core.PreparedStatement;
 import com.redhat.thermostat.storage.core.StatementDescriptor;
 import com.redhat.thermostat.storage.core.StatementExecutionException;
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/Criterion.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/Criterion.java	Mon Jun 08 16:33:12 2015 -0400
@@ -36,6 +36,8 @@
 
 package com.redhat.thermostat.storage.core.experimental.statement;
 
+import com.redhat.thermostat.storage.core.Id;
+
 /**
  *
  */
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/Id.java	Wed Jun 03 10:03:08 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright 2012-2015 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.storage.core.experimental.statement;
-
-import java.util.UUID;
-
-/**
- *
- */
-public class Id {
-    private String id;
-
-    public Id() {
-        id = UUID.randomUUID().toString();
-    }
-
-    public Id(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Id sessionID = (Id) o;
-
-        if (id != null ? !id.equals(sessionID.id) : sessionID.id != null)
-            return false;
-
-        return true;
-    }
-
-    public String get() {
-        return id;
-    }
-
-    @Override
-    public int hashCode() {
-        return id != null ? id.hashCode() : 0;
-    }
-}
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/LimitCriterion.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/LimitCriterion.java	Mon Jun 08 16:33:12 2015 -0400
@@ -36,6 +36,8 @@
 
 package com.redhat.thermostat.storage.core.experimental.statement;
 
+import com.redhat.thermostat.storage.core.Id;
+
 /**
  *
  */
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/Query.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/Query.java	Mon Jun 08 16:33:12 2015 -0400
@@ -36,6 +36,7 @@
 
 package com.redhat.thermostat.storage.core.experimental.statement;
 
+import com.redhat.thermostat.storage.core.Id;
 import com.redhat.thermostat.storage.model.Pojo;
 import java.util.ArrayList;
 import java.util.Collections;
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/QueryValues.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/QueryValues.java	Mon Jun 08 16:33:12 2015 -0400
@@ -40,6 +40,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.redhat.thermostat.storage.core.Id;
+
 /**
  *
  */
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/SortCriterion.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/SortCriterion.java	Mon Jun 08 16:33:12 2015 -0400
@@ -36,6 +36,8 @@
 
 package com.redhat.thermostat.storage.core.experimental.statement;
 
+import com.redhat.thermostat.storage.core.Id;
+
 /**
  *
  */
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/WhereCriterion.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/experimental/statement/WhereCriterion.java	Mon Jun 08 16:33:12 2015 -0400
@@ -38,6 +38,8 @@
 
 import java.util.Objects;
 
+import com.redhat.thermostat.storage.core.Id;
+
 /**
  *
  */
--- a/storage/core/src/test/java/com/redhat/thermostat/storage/core/experimental/statement/BeanAdapterBuilderTest.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/test/java/com/redhat/thermostat/storage/core/experimental/statement/BeanAdapterBuilderTest.java	Mon Jun 08 16:33:12 2015 -0400
@@ -37,6 +37,7 @@
 package com.redhat.thermostat.storage.core.experimental.statement;
 
 import com.redhat.thermostat.storage.core.DescriptorParsingException;
+import com.redhat.thermostat.storage.core.Id;
 import com.redhat.thermostat.storage.core.StatementDescriptor;
 import com.redhat.thermostat.storage.internal.statement.StatementDescriptorTester;
 import java.util.ArrayList;
--- a/storage/core/src/test/java/com/redhat/thermostat/storage/core/experimental/statement/BeanAdapterTest.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/test/java/com/redhat/thermostat/storage/core/experimental/statement/BeanAdapterTest.java	Mon Jun 08 16:33:12 2015 -0400
@@ -37,6 +37,7 @@
 package com.redhat.thermostat.storage.core.experimental.statement;
 
 import com.redhat.thermostat.storage.core.Cursor;
+import com.redhat.thermostat.storage.core.Id;
 import com.redhat.thermostat.storage.core.PreparedStatement;
 import com.redhat.thermostat.storage.core.StatementDescriptor;
 import com.redhat.thermostat.storage.core.Storage;
--- a/storage/core/src/test/java/com/redhat/thermostat/storage/core/experimental/statement/QueryValuesTest.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/storage/core/src/test/java/com/redhat/thermostat/storage/core/experimental/statement/QueryValuesTest.java	Mon Jun 08 16:33:12 2015 -0400
@@ -44,6 +44,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.redhat.thermostat.storage.core.Id;
+
 public class QueryValuesTest {
 
     private Query query;
--- a/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/ThreadDaoImpl.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/ThreadDaoImpl.java	Mon Jun 08 16:33:12 2015 -0400
@@ -49,7 +49,7 @@
 import com.redhat.thermostat.storage.core.VmRef;
 import com.redhat.thermostat.storage.core.experimental.statement.BeanAdapter;
 import com.redhat.thermostat.storage.core.experimental.statement.BeanAdapterBuilder;
-import com.redhat.thermostat.storage.core.experimental.statement.Id;
+import com.redhat.thermostat.storage.core.Id;
 import com.redhat.thermostat.storage.core.experimental.statement.Query;
 import com.redhat.thermostat.storage.core.experimental.statement.QueryValues;
 import com.redhat.thermostat.storage.core.experimental.statement.ResultHandler;
--- a/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/statement/SessionQueries.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/statement/SessionQueries.java	Mon Jun 08 16:33:12 2015 -0400
@@ -36,8 +36,13 @@
 
 package com.redhat.thermostat.thread.dao.impl.statement;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import com.redhat.thermostat.storage.core.Id;
 import com.redhat.thermostat.storage.core.experimental.statement.FieldDescriptor;
-import com.redhat.thermostat.storage.core.experimental.statement.Id;
 import com.redhat.thermostat.storage.core.experimental.statement.LimitCriterion;
 import com.redhat.thermostat.storage.core.experimental.statement.Query;
 import com.redhat.thermostat.storage.core.experimental.statement.SortCriterion;
@@ -45,10 +50,6 @@
 import com.redhat.thermostat.storage.core.experimental.statement.TypeMapper;
 import com.redhat.thermostat.storage.core.experimental.statement.WhereCriterion;
 import com.redhat.thermostat.thread.model.ThreadSession;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 
 /**
  *
--- a/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/statement/StateQueries.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/statement/StateQueries.java	Mon Jun 08 16:33:12 2015 -0400
@@ -37,7 +37,7 @@
 package com.redhat.thermostat.thread.dao.impl.statement;
 
 import com.redhat.thermostat.storage.core.experimental.statement.FieldDescriptor;
-import com.redhat.thermostat.storage.core.experimental.statement.Id;
+import com.redhat.thermostat.storage.core.Id;
 import com.redhat.thermostat.storage.core.experimental.statement.LimitCriterion;
 import com.redhat.thermostat.storage.core.experimental.statement.Query;
 import com.redhat.thermostat.storage.core.experimental.statement.SortCriterion;
--- a/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/statement/SummaryQuery.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/thread/collector/src/main/java/com/redhat/thermostat/thread/dao/impl/statement/SummaryQuery.java	Mon Jun 08 16:33:12 2015 -0400
@@ -37,7 +37,7 @@
 package com.redhat.thermostat.thread.dao.impl.statement;
 
 import com.redhat.thermostat.storage.core.experimental.statement.FieldDescriptor;
-import com.redhat.thermostat.storage.core.experimental.statement.Id;
+import com.redhat.thermostat.storage.core.Id;
 import com.redhat.thermostat.storage.core.experimental.statement.LimitCriterion;
 import com.redhat.thermostat.storage.core.experimental.statement.Query;
 import com.redhat.thermostat.storage.core.experimental.statement.SortCriterion;
--- a/thread/collector/src/main/java/com/redhat/thermostat/thread/model/SessionID.java	Wed Jun 03 10:03:08 2015 -0400
+++ b/thread/collector/src/main/java/com/redhat/thermostat/thread/model/SessionID.java	Mon Jun 08 16:33:12 2015 -0400
@@ -36,7 +36,7 @@
 
 package com.redhat.thermostat.thread.model;
 
-import com.redhat.thermostat.storage.core.experimental.statement.Id;
+import com.redhat.thermostat.storage.core.Id;
 
 /**
  *