From 8a9d9798d98e5bb1a212f1686ad8f335744d4b20 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Wed, 5 Feb 2014 14:55:02 +0100
Subject: [PATCH] Fix camelcasing inconsistency causing an assertion error.

java.lang.AssertionError: Searching for a field that's not there: serviceName
	at com.cloud.utils.db.SearchBase.set(SearchBase.java:219)
	at com.cloud.utils.db.SearchBase$Interceptor.intercept(SearchBase.java:475)
	at com.cloud.network.dao.MonitoringServiceVO$$EnhancerByCGLIB$$84195222.getServiceName(<generated>)
	at com.cloud.network.dao.MonitoringServiceDaoImpl.<init>(MonitoringServiceDaoImpl.java:41)
---
 .../com/cloud/network/MonitoringService.java  |  2 +-
 .../network/dao/MonitoringServiceDaoImpl.java |  4 +--
 .../network/dao/MonitoringServiceVO.java      | 28 +++++++++----------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/api/src/com/cloud/network/MonitoringService.java b/api/src/com/cloud/network/MonitoringService.java
index 63f2ec10425..b33e8ffe139 100644
--- a/api/src/com/cloud/network/MonitoringService.java
+++ b/api/src/com/cloud/network/MonitoringService.java
@@ -39,7 +39,7 @@ public interface MonitoringService extends ControlledEntity, Identity, InternalI
 
     String getServiceName();
 
-    String getPidFile();
+    String getServicePidFile();
 
     String getServicePath();
 }
diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
index c2292a245ba..fffb42b3f5e 100644
--- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceDaoImpl.java
@@ -37,10 +37,10 @@ public class MonitoringServiceDaoImpl extends GenericDaoBase<MonitoringServiceVO
         AllFieldsSearch = createSearchBuilder();
         AllFieldsSearch.and("isDefault", AllFieldsSearch.entity().isDefaultService(), SearchCriteria.Op.EQ);
         AllFieldsSearch.and("service", AllFieldsSearch.entity().getService(), SearchCriteria.Op.EQ);
-        AllFieldsSearch.and("processname", AllFieldsSearch.entity().getProcessname(), SearchCriteria.Op.EQ);
+        AllFieldsSearch.and("processname", AllFieldsSearch.entity().getProcessName(), SearchCriteria.Op.EQ);
         AllFieldsSearch.and("servicename", AllFieldsSearch.entity().getServiceName(), SearchCriteria.Op.EQ);
         AllFieldsSearch.and("servicepath", AllFieldsSearch.entity().getServicePath(), SearchCriteria.Op.EQ);
-        AllFieldsSearch.and("servicePidFile", AllFieldsSearch.entity().getPidFile(), SearchCriteria.Op.EQ);
+        AllFieldsSearch.and("servicePidFile", AllFieldsSearch.entity().getServicePidFile(), SearchCriteria.Op.EQ);
 
         AllFieldsSearch.done();
     }
diff --git a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
index 1d7ef145397..f9967ec486c 100644
--- a/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
+++ b/engine/schema/src/com/cloud/network/dao/MonitoringServiceVO.java
@@ -31,14 +31,13 @@ import com.cloud.network.MonitoringService;
 @Table(name = "monitoring_services")
 public class MonitoringServiceVO implements MonitoringService {
 
-    public MonitoringServiceVO(String service, String processname, String serviceName, String servicePath, String pidFile, boolean defaultService) {
+    public MonitoringServiceVO(String service, String processName, String serviceName, String servicePath, String servicePidFile, boolean defaultService) {
         this.service = service;
-        this.processname = processname;
-        this.servicename = serviceName;
+        this.processName = processName;
+        this.serviceName = serviceName;
         this.servicePath = servicePath;
-        this.servicePidFile = pidFile;
+        this.servicePidFile = servicePidFile;
         this.defaultService = defaultService;
-
     }
 
     protected MonitoringServiceVO() {
@@ -53,10 +52,10 @@ public class MonitoringServiceVO implements MonitoringService {
     String service;
 
     @Column(name = "process_name", updatable = false)
-    String processname;
+    String processName;
 
     @Column(name = "service_name", updatable = false)
-    String servicename;
+    String serviceName;
 
     @Column(name = "service_path", updatable = false)
     private String servicePath;
@@ -77,23 +76,22 @@ public class MonitoringServiceVO implements MonitoringService {
 
     @Override
     public String getService() {
-        return this.service;
+        return service;
     }
 
     @Override
     public String getServiceName() {
-        return this.servicename;  //To change body of implemented methods use File | Settings | File Templates.
+        return serviceName;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
     @Override
-    public String getPidFile() {
-        return this.servicePidFile;
-
+    public String getServicePidFile() {
+        return servicePidFile;
     }
 
     @Override
     public String getServicePath() {
-        return this.servicePidFile;
+        return servicePidFile;
     }
 
     @Override
@@ -115,7 +113,7 @@ public class MonitoringServiceVO implements MonitoringService {
         return defaultService;
     }
 
-    public String getProcessname() {
-        return processname;
+    public String getProcessName() {
+        return processName;
     }
 }