From 3f9a0c3183480d150089c0d5a6e507c877f7d121 Mon Sep 17 00:00:00 2001
From: "Smokowski, Steve (ss835w)" <ss835w@us.att.com>
Date: Thu, 2 May 2019 09:42:55 -0400
Subject: Enhance Openstack Client

Update Openstack Client to support additional fields
Updat all formatting issues

Issue-ID: SO-1844

Change-Id: I1369e0c18cc25274db8df7e12855a020b8da38da
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
---
 ceilometer-client/pom.xml                          | 47 +++++++++++-----------
 .../woorea/openstack/ceilometer/Ceilometer.java    | 16 ++++----
 .../ceilometer/QueriableCeilometerCommand.java     |  5 +--
 .../ceilometer/v2/api/MetersResource.java          |  2 +-
 .../ceilometer/v2/api/ResourcesResource.java       |  3 +-
 5 files changed, 36 insertions(+), 37 deletions(-)

(limited to 'ceilometer-client')

diff --git a/ceilometer-client/pom.xml b/ceilometer-client/pom.xml
index 4a255f4..4a9fedb 100644
--- a/ceilometer-client/pom.xml
+++ b/ceilometer-client/pom.xml
@@ -1,24 +1,25 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.onap.so.libs</groupId>
-		<artifactId>openstack-java-sdk</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
-	</parent>
-	<groupId>org.onap.so.libs.openstack-java-sdk</groupId>
-	<artifactId>ceilometer-client</artifactId>
-	<name>OpenStack Ceilometer Client</name>
-	<description>OpenStack Ceilometer Client</description>
-	<dependencies>
-		<dependency>
-			<groupId>org.onap.so.libs.openstack-java-sdk</groupId>
-			<artifactId>openstack-client</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.onap.so.libs.openstack-java-sdk</groupId>
-			<artifactId>ceilometer-model</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.libs</groupId>
+    <artifactId>openstack-java-sdk</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
+  <artifactId>ceilometer-client</artifactId>
+  <name>OpenStack Ceilometer Client</name>
+  <description>OpenStack Ceilometer Client</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
+      <artifactId>openstack-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.so.libs.openstack-java-sdk</groupId>
+      <artifactId>ceilometer-model</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java
index 6c18858..654d5c2 100644
--- a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java
+++ b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/Ceilometer.java
@@ -23,28 +23,28 @@ import com.woorea.openstack.ceilometer.v2.api.MetersResource;
 import com.woorea.openstack.ceilometer.v2.api.ResourcesResource;
 
 public class Ceilometer extends OpenStackClient {
-    
+
     private final MetersResource meters;
-    
+
     private final ResourcesResource resources;
-    
+
     public Ceilometer(String endpoint, OpenStackClientConnector connector) {
         super(endpoint, connector);
         meters = new MetersResource(this);
         resources = new ResourcesResource(this);
     }
-    
+
     public Ceilometer(String endpoint) {
         this(endpoint, null);
-        
+
     }
-    
+
     public ResourcesResource resources() {
         return resources;
     }
-    
+
     public MetersResource meters() {
         return meters;
     }
-    
+
 }
diff --git a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/QueriableCeilometerCommand.java b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/QueriableCeilometerCommand.java
index d8c0ead..8c9b813 100644
--- a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/QueriableCeilometerCommand.java
+++ b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/QueriableCeilometerCommand.java
@@ -19,10 +19,9 @@ package com.woorea.openstack.ceilometer;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-
 import com.woorea.openstack.base.client.OpenStackRequest;
 
-public abstract class QueriableCeilometerCommand<T,R> extends OpenStackRequest<R> {
+public abstract class QueriableCeilometerCommand<T, R> extends OpenStackRequest<R> {
 
     protected List<String> fields = new ArrayList<>();
 
@@ -61,4 +60,4 @@ public abstract class QueriableCeilometerCommand<T,R> extends OpenStackRequest<R
         return filter(field, "gt", value);
     }
 
-}
\ No newline at end of file
+}
diff --git a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/MetersResource.java b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/MetersResource.java
index ae8f085..09d4346 100644
--- a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/MetersResource.java
+++ b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/MetersResource.java
@@ -77,4 +77,4 @@ public class MetersResource {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/ResourcesResource.java b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/ResourcesResource.java
index 3fac7b8..afce485 100644
--- a/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/ResourcesResource.java
+++ b/ceilometer-client/src/main/java/com/woorea/openstack/ceilometer/v2/api/ResourcesResource.java
@@ -17,7 +17,6 @@
 package com.woorea.openstack.ceilometer.v2.api;
 
 import java.util.List;
-
 import com.woorea.openstack.base.client.OpenStackClient;
 import com.woorea.openstack.base.client.OpenStackRequest;
 import com.woorea.openstack.ceilometer.QueriableCeilometerCommand;
@@ -55,4 +54,4 @@ public class ResourcesResource {
 
     }
 
-}
\ No newline at end of file
+}
-- 
cgit 1.2.3-korg