From bd5ad22b73ed0bffd35f34da9ef6c03827133ec6 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Wed, 8 Sep 2021 12:54:51 +0200 Subject: [PATCH] Cleanup. --- build.gradle | 5 +- gradle.properties | 2 +- .../java/biz/nellemann/hmci/HmcInstance.java | 11 ++-- .../biz/nellemann/hmci/HmcRestClient.java | 34 +++++----- .../biz/nellemann/hmci/LogicalPartition.java | 24 +++---- .../biz/nellemann/hmci/ManagedSystem.java | 64 +++++++++---------- .../java/biz/nellemann/hmci/SystemEnergy.java | 8 +-- .../biz/nellemann/hmci/pcm/EnergyUtil.java | 6 +- .../hmci/pcm/FiberChannelAdapter.java | 2 +- .../nellemann/hmci/pcm/GenericAdapter.java | 5 +- .../hmci/pcm/GenericPhysicalAdapters.java | 2 +- .../hmci/pcm/GenericVirtualAdapter.java | 2 +- .../biz/nellemann/hmci/pcm/LparMemory.java | 2 +- .../biz/nellemann/hmci/pcm/LparProcessor.java | 2 +- .../java/biz/nellemann/hmci/pcm/LparUtil.java | 10 +-- .../java/biz/nellemann/hmci/pcm/Network.java | 10 +-- .../java/biz/nellemann/hmci/pcm/PcmData.java | 4 +- .../hmci/pcm/PhysicalProcessorPool.java | 5 +- .../biz/nellemann/hmci/pcm/PowerUtil.java | 2 +- .../biz/nellemann/hmci/pcm/SampleInfo.java | 2 +- .../biz/nellemann/hmci/pcm/ServerMemory.java | 2 +- .../nellemann/hmci/pcm/ServerProcessor.java | 2 +- .../biz/nellemann/hmci/pcm/ServerUtil.java | 10 +-- .../biz/nellemann/hmci/pcm/SharedAdapter.java | 2 +- .../hmci/pcm/SharedProcessorPool.java | 2 +- .../java/biz/nellemann/hmci/pcm/Storage.java | 12 ++-- .../nellemann/hmci/pcm/SystemFirmware.java | 5 +- .../biz/nellemann/hmci/pcm/SystemUtil.java | 2 +- .../biz/nellemann/hmci/pcm/Temperature.java | 2 +- .../biz/nellemann/hmci/pcm/ThermalUtil.java | 8 +-- .../java/biz/nellemann/hmci/pcm/UtilInfo.java | 5 +- .../biz/nellemann/hmci/pcm/UtilSample.java | 14 ++-- .../biz/nellemann/hmci/pcm/ViosMemory.java | 2 +- .../java/biz/nellemann/hmci/pcm/ViosUtil.java | 10 +-- .../hmci/pcm/VirtualEthernetAdapter.java | 2 +- .../hmci/pcm/VirtualFiberChannelAdapter.java | 5 +- 36 files changed, 136 insertions(+), 151 deletions(-) diff --git a/build.gradle b/build.gradle index 2667016..00b2208 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ repositories { dependencies { annotationProcessor 'info.picocli:picocli-codegen:4.6.1' implementation 'info.picocli:picocli:4.6.1' - implementation 'org.jsoup:jsoup:1.14.1' + implementation 'org.jsoup:jsoup:1.14.2' implementation 'com.squareup.okhttp3:okhttp:4.9.1' implementation 'com.squareup.moshi:moshi:1.12.0' implementation 'com.serjltt.moshi:moshi-lazy-adapters:2.2' @@ -35,6 +35,7 @@ dependencies { application { mainClass.set('biz.nellemann.hmci.Application') + applicationDefaultJvmArgs = [ "-server", "-Xms256m", "-Xmx1024m" ] } test { @@ -78,7 +79,7 @@ buildDeb { } jacoco { - toolVersion = "0.8.6" + toolVersion = "0.8.7" } jacocoTestReport { diff --git a/gradle.properties b/gradle.properties index ef18501..9173dbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ id = hmci group = biz.nellemann.hmci -version = 1.2.3 +version = 1.2.4 diff --git a/src/main/java/biz/nellemann/hmci/HmcInstance.java b/src/main/java/biz/nellemann/hmci/HmcInstance.java index e2a4a0c..27335f9 100644 --- a/src/main/java/biz/nellemann/hmci/HmcInstance.java +++ b/src/main/java/biz/nellemann/hmci/HmcInstance.java @@ -59,8 +59,7 @@ class HmcInstance implements Runnable { if(configHmc.trace != null) { try { traceDir = new File(configHmc.trace); - traceDir.mkdirs(); - if(traceDir.canWrite()) { + if(traceDir.mkdirs() && traceDir.canWrite()) { doTrace = true; } else { log.warn("HmcInstance() - can't write to trace dir: " + traceDir.toString()); @@ -155,12 +154,12 @@ class HmcInstance implements Runnable { hmcRestClient.enableEnergyMonitoring(system); } - // Get LPAR's for this system + // Get partitions for this system try { - hmcRestClient.getLogicalPartitionsForManagedSystem(system).forEach(tmpPartitions::put); + tmpPartitions.putAll(hmcRestClient.getLogicalPartitionsForManagedSystem(system)); if(!tmpPartitions.isEmpty()) { partitions.clear(); - tmpPartitions.forEach(partitions::put); + partitions.putAll(tmpPartitions); } } catch (Exception e) { log.warn("discover() - getLogicalPartitions", e); @@ -205,7 +204,7 @@ class HmcInstance implements Runnable { try { - // Get LPAR's for this system + // Get partitions for this system partitions.forEach((partitionId, partition) -> { // Get and process metrics for this partition diff --git a/src/main/java/biz/nellemann/hmci/HmcRestClient.java b/src/main/java/biz/nellemann/hmci/HmcRestClient.java index 350bcd2..02a4e41 100644 --- a/src/main/java/biz/nellemann/hmci/HmcRestClient.java +++ b/src/main/java/biz/nellemann/hmci/HmcRestClient.java @@ -167,7 +167,7 @@ public class HmcRestClient { Map managedSystemsMap = new HashMap<>(); // Do not try to parse empty response - if(responseBody == null || responseBody.isEmpty() || responseBody.length() <= 1) { + if(responseBody == null || responseBody.length() <= 1) { responseErrors++; return managedSystemsMap; } @@ -207,7 +207,7 @@ public class HmcRestClient { Map partitionMap = new HashMap<>(); // Do not try to parse empty response - if(responseBody == null || responseBody.isEmpty() || responseBody.length() <= 1) { + if(responseBody == null || responseBody.length() <= 1) { responseErrors++; return partitionMap; } @@ -247,7 +247,7 @@ public class HmcRestClient { String jsonBody = null; // Do not try to parse empty response - if(responseBody == null || responseBody.isEmpty() || responseBody.length() <= 1) { + if(responseBody == null || responseBody.length() <= 1) { responseErrors++; log.warn("getPcmDataForManagedSystem() - empty response, skipping: " + system.name); return null; @@ -256,9 +256,9 @@ public class HmcRestClient { try { Document doc = Jsoup.parse(responseBody); Element entry = doc.select("feed > entry").first(); - Element link = entry.select("link[href]").first(); + Element link = Objects.requireNonNull(entry).select("link[href]").first(); - if(link.attr("type").equals("application/json")) { + if(Objects.requireNonNull(link).attr("type").equals("application/json")) { String href = link.attr("href"); log.trace("getPcmDataForManagedSystem() - json url: " + href); jsonBody = sendGetRequest(new URL(href)); @@ -285,7 +285,7 @@ public class HmcRestClient { String jsonBody = null; // Do not try to parse empty response - if(responseBody == null || responseBody.isEmpty() || responseBody.length() <= 1) { + if(responseBody == null || responseBody.length() <= 1) { responseErrors++; log.warn("getPcmDataForLogicalPartition() - empty response, skipping: " + partition.name); return null; @@ -294,9 +294,9 @@ public class HmcRestClient { try { Document doc = Jsoup.parse(responseBody); Element entry = doc.select("feed > entry").first(); - Element link = entry.select("link[href]").first(); + Element link = Objects.requireNonNull(entry).select("link[href]").first(); - if(link.attr("type").equals("application/json")) { + if(Objects.requireNonNull(link).attr("type").equals("application/json")) { String href = link.attr("href"); log.trace("getPcmDataForLogicalPartition() - json url: " + href); jsonBody = sendGetRequest(new URL(href)); @@ -325,7 +325,7 @@ public class HmcRestClient { //log.info(responseBody); // Do not try to parse empty response - if(responseBody == null || responseBody.isEmpty() || responseBody.length() <= 1) { + if(responseBody == null || responseBody.length() <= 1) { responseErrors++; log.trace("getPcmDataForEnergy() - empty response"); return null; @@ -334,9 +334,9 @@ public class HmcRestClient { try { Document doc = Jsoup.parse(responseBody); Element entry = doc.select("feed > entry").first(); - Element link = entry.select("link[href]").first(); + Element link = Objects.requireNonNull(entry).select("link[href]").first(); - if(link.attr("type").equals("application/json")) { + if(Objects.requireNonNull(link).attr("type").equals("application/json")) { String href = link.attr("href"); log.trace("getPcmDataForEnergy() - json url: " + href); jsonBody = sendGetRequest(new URL(href)); @@ -363,7 +363,7 @@ public class HmcRestClient { String jsonBody = null; // Do not try to parse empty response - if(responseBody == null || responseBody.isEmpty() || responseBody.length() <= 1) { + if(responseBody == null || responseBody.length() <= 1) { responseErrors++; log.warn("enableEnergyMonitoring() - empty response"); return; @@ -374,16 +374,16 @@ public class HmcRestClient { doc.outputSettings().prettyPrint(false); doc.outputSettings().charset("US-ASCII"); Element entry = doc.select("feed > entry").first(); - Element link1 = entry.select("EnergyMonitoringCapable").first(); + Element link1 = Objects.requireNonNull(entry).select("EnergyMonitoringCapable").first(); Element link2 = entry.select("EnergyMonitorEnabled").first(); - if(link1.text().equals("true")) { + if(Objects.requireNonNull(link1).text().equals("true")) { log.debug("enableEnergyMonitoring() - EnergyMonitoringCapable == true"); - if(link2.text().equals("false")) { + if(Objects.requireNonNull(link2).text().equals("false")) { //log.warn("enableEnergyMonitoring() - EnergyMonitorEnabled == false"); link2.text("true"); - Document content = Jsoup.parse(doc.select("Content").first().html(), "", Parser.xmlParser()); + Document content = Jsoup.parse(Objects.requireNonNull(doc.select("Content").first()).html(), "", Parser.xmlParser()); content.outputSettings().escapeMode(Entities.EscapeMode.xhtml); content.outputSettings().prettyPrint(false); content.outputSettings().charset("UTF-8"); @@ -514,7 +514,7 @@ public class HmcRestClient { final SSLContext sslContext = SSLContext.getInstance("SSL"); sslContext.init(null, trustAllCerts, new SecureRandom()); - // Create an ssl socket factory with our all-trusting manager + // Create a ssl socket factory with our all-trusting manager final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory(); OkHttpClient.Builder builder = new OkHttpClient.Builder(); diff --git a/src/main/java/biz/nellemann/hmci/LogicalPartition.java b/src/main/java/biz/nellemann/hmci/LogicalPartition.java index 4bcc2fb..7a9c73c 100644 --- a/src/main/java/biz/nellemann/hmci/LogicalPartition.java +++ b/src/main/java/biz/nellemann/hmci/LogicalPartition.java @@ -55,7 +55,7 @@ class LogicalPartition extends MetaSystem { Map tagsMap = new HashMap<>(); tagsMap.put("servername", system.name); tagsMap.put("lparname", name); - log.trace("getDetails() - tags: " + tagsMap.toString()); + log.trace("getDetails() - tags: " + tagsMap); Map fieldsMap = new HashMap<>(); fieldsMap.put("id", metrics.systemUtil.sample.lparsUtil.id); @@ -63,7 +63,7 @@ class LogicalPartition extends MetaSystem { fieldsMap.put("state", metrics.systemUtil.sample.lparsUtil.state); fieldsMap.put("osType", metrics.systemUtil.sample.lparsUtil.osType); fieldsMap.put("affinityScore", metrics.systemUtil.sample.lparsUtil.affinityScore); - log.trace("getDetails() - fields: " + fieldsMap.toString()); + log.trace("getDetails() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); return list; @@ -78,12 +78,12 @@ class LogicalPartition extends MetaSystem { Map tagsMap = new HashMap<>(); tagsMap.put("servername", system.name); tagsMap.put("lparname", name); - log.trace("getMemoryMetrics() - tags: " + tagsMap.toString()); + log.trace("getMemoryMetrics() - tags: " + tagsMap); Map fieldsMap = new HashMap<>(); fieldsMap.put("logicalMem", metrics.systemUtil.sample.lparsUtil.memory.logicalMem); fieldsMap.put("backedPhysicalMem", metrics.systemUtil.sample.lparsUtil.memory.backedPhysicalMem); - log.trace("getMemoryMetrics() - fields: " + fieldsMap.toString()); + log.trace("getMemoryMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); return list; @@ -98,7 +98,7 @@ class LogicalPartition extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", system.name); tagsMap.put("lparname", name); - log.trace("getProcessorMetrics() - tags: " + tagsMap.toString()); + log.trace("getProcessorMetrics() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("utilizedProcUnits", metrics.systemUtil.sample.lparsUtil.processor.utilizedProcUnits); @@ -115,7 +115,7 @@ class LogicalPartition extends MetaSystem { fieldsMap.put("mode", metrics.systemUtil.sample.lparsUtil.processor.mode); fieldsMap.put("weight", metrics.systemUtil.sample.lparsUtil.processor.weight); fieldsMap.put("poolId", metrics.systemUtil.sample.lparsUtil.processor.poolId); - log.trace("getProcessorMetrics() - fields: " + fieldsMap.toString()); + log.trace("getProcessorMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); return list; @@ -136,7 +136,7 @@ class LogicalPartition extends MetaSystem { tagsMap.put("viosId", adapter.viosId.toString()); tagsMap.put("vlanId", adapter.vlanId.toString()); tagsMap.put("vswitchId", adapter.vswitchId.toString()); - log.trace("getVirtualEthernetAdapterMetrics() - tags: " + tagsMap.toString()); + log.trace("getVirtualEthernetAdapterMetrics() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("droppedPackets", adapter.droppedPackets); @@ -153,7 +153,7 @@ class LogicalPartition extends MetaSystem { fieldsMap.put("transferredBytes", adapter.transferredBytes); fieldsMap.put("transferredPhysicalBytes", adapter.transferredPhysicalBytes); fieldsMap.put("sharedEthernetAdapterId", adapter.sharedEthernetAdapterId); - log.trace("getVirtualEthernetAdapterMetrics() - fields: " + fieldsMap.toString()); + log.trace("getVirtualEthernetAdapterMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -174,7 +174,7 @@ class LogicalPartition extends MetaSystem { tagsMap.put("viosId", adapter.viosId.toString()); tagsMap.put("location", adapter.physicalLocation); tagsMap.put("id", adapter.id); - log.trace("getVirtualGenericAdapterMetrics() - tags: " + tagsMap.toString()); + log.trace("getVirtualGenericAdapterMetrics() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("numOfReads", adapter.numOfReads); @@ -182,7 +182,7 @@ class LogicalPartition extends MetaSystem { fieldsMap.put("writeBytes", adapter.writeBytes); fieldsMap.put("readBytes", adapter.readBytes); fieldsMap.put("type", adapter.type); - log.trace("getVirtualGenericAdapterMetrics() - fields: " + fieldsMap.toString()); + log.trace("getVirtualGenericAdapterMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -201,7 +201,7 @@ class LogicalPartition extends MetaSystem { tagsMap.put("lparname", name); tagsMap.put("viosId", adapter.viosId.toString()); tagsMap.put("location", adapter.physicalLocation); - log.trace("getVirtualFibreChannelAdapterMetrics() - tags: " + tagsMap.toString()); + log.trace("getVirtualFibreChannelAdapterMetrics() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("numOfReads", adapter.numOfReads); @@ -213,7 +213,7 @@ class LogicalPartition extends MetaSystem { fieldsMap.put("transferredByte", adapter.transmittedBytes); // TODO: Must be error in dashboard, remove when checked. //fieldsMap.put("wwpn", adapter.wwpn); //fieldsMap.put("wwpn2", adapter.wwpn2); - log.trace("getVirtualFibreChannelAdapterMetrics() - fields: " + fieldsMap.toString()); + log.trace("getVirtualFibreChannelAdapterMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); diff --git a/src/main/java/biz/nellemann/hmci/ManagedSystem.java b/src/main/java/biz/nellemann/hmci/ManagedSystem.java index c37e0af..3fdf03b 100644 --- a/src/main/java/biz/nellemann/hmci/ManagedSystem.java +++ b/src/main/java/biz/nellemann/hmci/ManagedSystem.java @@ -58,7 +58,7 @@ class ManagedSystem extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", name); - log.trace("getDetails() - tags: " + tagsMap.toString()); + log.trace("getDetails() - tags: " + tagsMap); Map fieldsMap = new HashMap<>(); fieldsMap.put("mtm", String.format("%s-%s %s", type, model, serialNumber)); @@ -69,7 +69,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("name", name); fieldsMap.put("utilizedProcUnits", metrics.systemUtil.sample.systemFirmwareUtil.utilizedProcUnits); fieldsMap.put("assignedMem", metrics.systemUtil.sample.systemFirmwareUtil.assignedMem); - log.trace("getDetails() - fields: " + fieldsMap.toString()); + log.trace("getDetails() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); return list; @@ -83,7 +83,7 @@ class ManagedSystem extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", name); - log.trace("getMemoryMetrics() - tags: " + tagsMap.toString()); + log.trace("getMemoryMetrics() - tags: " + tagsMap); Map fieldsMap = new HashMap<>(); fieldsMap.put("totalMem", metrics.systemUtil.sample.serverUtil.memory.totalMem); @@ -91,7 +91,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("configurableMem", metrics.systemUtil.sample.serverUtil.memory.configurableMem); fieldsMap.put("assignedMemToLpars", metrics.systemUtil.sample.serverUtil.memory.assignedMemToLpars); fieldsMap.put("virtualPersistentMem", metrics.systemUtil.sample.serverUtil.memory.virtualPersistentMem); - log.trace("getMemoryMetrics() - fields: " + fieldsMap.toString()); + log.trace("getMemoryMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); return list; @@ -105,14 +105,14 @@ class ManagedSystem extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", name); - log.trace("getProcessorMetrics() - tags: " + tagsMap.toString()); + log.trace("getProcessorMetrics() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("totalProcUnits", metrics.systemUtil.sample.serverUtil.processor.totalProcUnits); fieldsMap.put("utilizedProcUnits", metrics.systemUtil.sample.serverUtil.processor.utilizedProcUnits); fieldsMap.put("availableProcUnits", metrics.systemUtil.sample.serverUtil.processor.availableProcUnits); fieldsMap.put("configurableProcUnits", metrics.systemUtil.sample.serverUtil.processor.configurableProcUnits); - log.trace("getProcessorMetrics() - fields: " + fieldsMap.toString()); + log.trace("getProcessorMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); return list; @@ -128,7 +128,7 @@ class ManagedSystem extends MetaSystem { tagsMap.put("servername", name); tagsMap.put("pool", sharedProcessorPool.id); tagsMap.put("poolname", sharedProcessorPool.name); - log.trace("getSharedProcessorPools() - tags: " + tagsMap.toString()); + log.trace("getSharedProcessorPools() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("assignedProcUnits", sharedProcessorPool.assignedProcUnits); @@ -136,7 +136,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("utilizedProcUnits", sharedProcessorPool.utilizedProcUnits); fieldsMap.put("borrowedProcUnits", sharedProcessorPool.borrowedProcUnits); fieldsMap.put("configuredProcUnits", sharedProcessorPool.configuredProcUnits); - log.trace("getSharedProcessorPools() - fields: " + fieldsMap.toString()); + log.trace("getSharedProcessorPools() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -152,7 +152,7 @@ class ManagedSystem extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", name); - log.trace("getPhysicalProcessorPool() - tags: " + tagsMap.toString()); + log.trace("getPhysicalProcessorPool() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("assignedProcUnits", metrics.systemUtil.sample.serverUtil.physicalProcessorPool.assignedProcUnits); @@ -160,7 +160,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("utilizedProcUnits", metrics.systemUtil.sample.serverUtil.physicalProcessorPool.utilizedProcUnits); fieldsMap.put("configuredProcUnits", metrics.systemUtil.sample.serverUtil.physicalProcessorPool.configuredProcUnits); fieldsMap.put("borrowedProcUnits", metrics.systemUtil.sample.serverUtil.physicalProcessorPool.borrowedProcUnits); - log.trace("getPhysicalProcessorPool() - fields: " + fieldsMap.toString()); + log.trace("getPhysicalProcessorPool() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); return list; @@ -176,14 +176,14 @@ class ManagedSystem extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", name); tagsMap.put("viosname", vios.name); - log.trace("getViosDetails() - tags: " + tagsMap.toString()); + log.trace("getViosDetails() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("viosid", vios.id); fieldsMap.put("viosstate", vios.state); fieldsMap.put("viosname", vios.name); fieldsMap.put("affinityScore", vios.affinityScore); - log.trace("getViosDetails() - fields: " + fieldsMap.toString()); + log.trace("getViosDetails() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -201,7 +201,7 @@ class ManagedSystem extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", name); tagsMap.put("viosname", vios.name); - log.trace("getViosMemoryMetrics() - tags: " + tagsMap.toString()); + log.trace("getViosMemoryMetrics() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); Number assignedMem = getNumberMetricObject(vios.memory.assignedMem); @@ -216,7 +216,7 @@ class ManagedSystem extends MetaSystem { Number usedMemPct = (utilizedMem.intValue() * 100 ) / assignedMem.intValue(); fieldsMap.put("utilizedPct", usedMemPct.floatValue()); } - log.trace("getViosMemoryMetrics() - fields: " + fieldsMap.toString()); + log.trace("getViosMemoryMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -234,7 +234,7 @@ class ManagedSystem extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", name); tagsMap.put("viosname", vios.name); - log.trace("getViosProcessorMetrics() - tags: " + tagsMap.toString()); + log.trace("getViosProcessorMetrics() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("utilizedProcUnits", vios.processor.utilizedProcUnits); @@ -249,7 +249,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("timeSpentWaitingForDispatch", vios.processor.timePerInstructionExecution); fieldsMap.put("timePerInstructionExecution", vios.processor.timeSpentWaitingForDispatch); fieldsMap.put("weight", vios.processor.weight); - log.trace("getViosProcessorMetrics() - fields: " + fieldsMap.toString()); + log.trace("getViosProcessorMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -267,11 +267,11 @@ class ManagedSystem extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", name); tagsMap.put("viosname", vios.name); - log.trace("getViosNetworkLpars() - tags: " + tagsMap.toString()); + log.trace("getViosNetworkLpars() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("clientlpars", vios.network.clientLpars.size()); - log.trace("getViosNetworkLpars() - fields: " + fieldsMap.toString()); + log.trace("getViosNetworkLpars() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -293,7 +293,7 @@ class ManagedSystem extends MetaSystem { tagsMap.put("viosname", vios.name); //tagsMap.put("id", adapter.id); tagsMap.put("location", adapter.physicalLocation); - log.trace("getViosNetworkSharedAdapters() - tags: " + tagsMap.toString()); + log.trace("getViosNetworkSharedAdapters() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("id", adapter.id); @@ -305,7 +305,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("droppedPackets", adapter.droppedPackets); fieldsMap.put("transferredBytes", adapter.transferredBytes); fieldsMap.put("physicalLocation", adapter.physicalLocation); - log.trace("getViosNetworkSharedAdapters() - fields: " + fieldsMap.toString()); + log.trace("getViosNetworkSharedAdapters() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -331,7 +331,7 @@ class ManagedSystem extends MetaSystem { tagsMap.put("systemname", name); tagsMap.put("viosname", vios.name); tagsMap.put("location", adapter.physicalLocation); - log.trace("getViosNetworkVirtualAdapters() - tags: " + tagsMap.toString()); + log.trace("getViosNetworkVirtualAdapters() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("droppedPackets", adapter.droppedPackets); @@ -348,7 +348,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("transferredBytes", adapter.transferredBytes); fieldsMap.put("transferredPhysicalBytes", adapter.transferredPhysicalBytes); fieldsMap.put("physicalLocation", adapter.physicalLocation); - log.trace("getViosNetworkVirtualAdapters() - fields: " + fieldsMap.toString()); + log.trace("getViosNetworkVirtualAdapters() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -373,7 +373,7 @@ class ManagedSystem extends MetaSystem { tagsMap.put("servername", name); tagsMap.put("viosname", vios.name); tagsMap.put("location", adapter.physicalLocation); - log.trace("getViosNetworkGenericAdapters() - tags: " + tagsMap.toString()); + log.trace("getViosNetworkGenericAdapters() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("sentBytes", adapter.sentBytes); @@ -382,7 +382,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("receivedPackets", adapter.receivedPackets); fieldsMap.put("droppedPackets", adapter.droppedPackets); fieldsMap.put("transferredBytes", adapter.transferredBytes); - log.trace("getViosNetworkGenericAdapters() - fields: " + fieldsMap.toString()); + log.trace("getViosNetworkGenericAdapters() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -401,11 +401,11 @@ class ManagedSystem extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", name); tagsMap.put("viosname", vios.name); - log.trace("getViosStorageLpars() - tags: " + tagsMap.toString()); + log.trace("getViosStorageLpars() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("clientlpars", vios.storage.clientLpars.size()); - log.trace("getViosStorageLpars() - fields: " + fieldsMap.toString()); + log.trace("getViosStorageLpars() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -427,7 +427,7 @@ class ManagedSystem extends MetaSystem { tagsMap.put("servername", name); tagsMap.put("viosname", vios.name); tagsMap.put("location", adapter.physicalLocation); - log.trace("getViosStorageFiberChannelAdapters() - tags: " + tagsMap.toString()); + log.trace("getViosStorageFiberChannelAdapters() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("numOfReads", adapter.numOfReads); @@ -436,7 +436,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("writeBytes", adapter.writeBytes); fieldsMap.put("transmittedBytes", adapter.transmittedBytes); fieldsMap.put("physicalLocation", adapter.physicalLocation); - log.trace("getViosStorageFiberChannelAdapters() - fields: " + fieldsMap.toString()); + log.trace("getViosStorageFiberChannelAdapters() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -494,7 +494,7 @@ class ManagedSystem extends MetaSystem { tagsMap.put("viosname", vios.name); tagsMap.put("id", adapter.id); tagsMap.put("location", adapter.physicalLocation); - log.trace("getViosStoragePhysicalAdapters() - tags: " + tagsMap.toString()); + log.trace("getViosStoragePhysicalAdapters() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("numOfReads", adapter.numOfReads); @@ -504,7 +504,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("transmittedBytes", adapter.transmittedBytes); fieldsMap.put("type", adapter.type); fieldsMap.put("physicalLocation", adapter.physicalLocation); - log.trace("getViosStoragePhysicalAdapters() - fields: " + fieldsMap.toString()); + log.trace("getViosStoragePhysicalAdapters() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); @@ -529,7 +529,7 @@ class ManagedSystem extends MetaSystem { tagsMap.put("viosname", vios.name); tagsMap.put("location", adapter.physicalLocation); tagsMap.put("id", adapter.id); - log.trace("getViosStorageVirtualAdapters() - tags: " + tagsMap.toString()); + log.trace("getViosStorageVirtualAdapters() - tags: " + tagsMap); HashMap fieldsMap = new HashMap<>(); fieldsMap.put("numOfReads", adapter.numOfReads); @@ -539,7 +539,7 @@ class ManagedSystem extends MetaSystem { fieldsMap.put("transmittedBytes", adapter.transmittedBytes); fieldsMap.put("type", adapter.type); fieldsMap.put("physicalLocation", adapter.physicalLocation); - log.trace("getViosStorageVirtualAdapters() - fields: " + fieldsMap.toString()); + log.trace("getViosStorageVirtualAdapters() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); }); diff --git a/src/main/java/biz/nellemann/hmci/SystemEnergy.java b/src/main/java/biz/nellemann/hmci/SystemEnergy.java index 678c78e..f020127 100644 --- a/src/main/java/biz/nellemann/hmci/SystemEnergy.java +++ b/src/main/java/biz/nellemann/hmci/SystemEnergy.java @@ -48,11 +48,11 @@ class SystemEnergy extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", system.name); - log.trace("getPowerMetrics() - tags: " + tagsMap.toString()); + log.trace("getPowerMetrics() - tags: " + tagsMap); Map fieldsMap = new HashMap<>(); fieldsMap.put("powerReading", metrics.systemUtil.sample.energyUtil.powerUtil.powerReading); - log.trace("getPowerMetrics() - fields: " + fieldsMap.toString()); + log.trace("getPowerMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); return list; @@ -65,7 +65,7 @@ class SystemEnergy extends MetaSystem { HashMap tagsMap = new HashMap<>(); tagsMap.put("servername", system.name); - log.trace("getThermalMetrics() - tags: " + tagsMap.toString()); + log.trace("getThermalMetrics() - tags: " + tagsMap); Map fieldsMap = new HashMap<>(); @@ -82,7 +82,7 @@ class SystemEnergy extends MetaSystem { fieldsMap.put("baseboardTemperature_" + t.entityInstance, t.temperatureReading); }*/ - log.trace("getThermalMetrics() - fields: " + fieldsMap.toString()); + log.trace("getThermalMetrics() - fields: " + fieldsMap); list.add(new Measurement(tagsMap, fieldsMap)); return list; } diff --git a/src/main/java/biz/nellemann/hmci/pcm/EnergyUtil.java b/src/main/java/biz/nellemann/hmci/pcm/EnergyUtil.java index 3834a1d..a17bfed 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/EnergyUtil.java +++ b/src/main/java/biz/nellemann/hmci/pcm/EnergyUtil.java @@ -1,6 +1,6 @@ package biz.nellemann.hmci.pcm; -public class EnergyUtil { - public PowerUtil powerUtil = new PowerUtil(); - public ThermalUtil thermalUtil = new ThermalUtil(); +public final class EnergyUtil { + public final PowerUtil powerUtil = new PowerUtil(); + public final ThermalUtil thermalUtil = new ThermalUtil(); } diff --git a/src/main/java/biz/nellemann/hmci/pcm/FiberChannelAdapter.java b/src/main/java/biz/nellemann/hmci/pcm/FiberChannelAdapter.java index 736929b..ddb13bb 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/FiberChannelAdapter.java +++ b/src/main/java/biz/nellemann/hmci/pcm/FiberChannelAdapter.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class FiberChannelAdapter { +public final class FiberChannelAdapter { public String id = ""; public String wwpn = ""; diff --git a/src/main/java/biz/nellemann/hmci/pcm/GenericAdapter.java b/src/main/java/biz/nellemann/hmci/pcm/GenericAdapter.java index 1aa39c8..c9bb58b 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/GenericAdapter.java +++ b/src/main/java/biz/nellemann/hmci/pcm/GenericAdapter.java @@ -2,10 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -import java.util.ArrayList; -import java.util.List; - -public class GenericAdapter { +public final class GenericAdapter { public String id = ""; public String type = ""; diff --git a/src/main/java/biz/nellemann/hmci/pcm/GenericPhysicalAdapters.java b/src/main/java/biz/nellemann/hmci/pcm/GenericPhysicalAdapters.java index 173ce0a..3c92347 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/GenericPhysicalAdapters.java +++ b/src/main/java/biz/nellemann/hmci/pcm/GenericPhysicalAdapters.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class GenericPhysicalAdapters { +public final class GenericPhysicalAdapters { public String id = ""; public String type = ""; diff --git a/src/main/java/biz/nellemann/hmci/pcm/GenericVirtualAdapter.java b/src/main/java/biz/nellemann/hmci/pcm/GenericVirtualAdapter.java index 13fd9b8..bdf218f 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/GenericVirtualAdapter.java +++ b/src/main/java/biz/nellemann/hmci/pcm/GenericVirtualAdapter.java @@ -3,7 +3,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class GenericVirtualAdapter { +public final class GenericVirtualAdapter { public String id = ""; public String type = ""; diff --git a/src/main/java/biz/nellemann/hmci/pcm/LparMemory.java b/src/main/java/biz/nellemann/hmci/pcm/LparMemory.java index 6ed81c1..2c2aa25 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/LparMemory.java +++ b/src/main/java/biz/nellemann/hmci/pcm/LparMemory.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class LparMemory { +public final class LparMemory { @FirstElement public Number logicalMem = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/LparProcessor.java b/src/main/java/biz/nellemann/hmci/pcm/LparProcessor.java index c39e76c..bd3bf36 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/LparProcessor.java +++ b/src/main/java/biz/nellemann/hmci/pcm/LparProcessor.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class LparProcessor { +public final class LparProcessor { public Integer poolId = 0; public Integer weight = 0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/LparUtil.java b/src/main/java/biz/nellemann/hmci/pcm/LparUtil.java index c50e730..81af1dc 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/LparUtil.java +++ b/src/main/java/biz/nellemann/hmci/pcm/LparUtil.java @@ -1,6 +1,6 @@ package biz.nellemann.hmci.pcm; -public class LparUtil { +public final class LparUtil { public Integer id = 0; public String uuid = ""; @@ -10,9 +10,9 @@ public class LparUtil { public String osType = ""; public Number affinityScore = 0.0f; - public LparMemory memory = new LparMemory(); - public LparProcessor processor = new LparProcessor(); - public Network network = new Network(); - public Storage storage = new Storage(); + public final LparMemory memory = new LparMemory(); + public final LparProcessor processor = new LparProcessor(); + public final Network network = new Network(); + public final Storage storage = new Storage(); } diff --git a/src/main/java/biz/nellemann/hmci/pcm/Network.java b/src/main/java/biz/nellemann/hmci/pcm/Network.java index d0449e5..cbd963d 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/Network.java +++ b/src/main/java/biz/nellemann/hmci/pcm/Network.java @@ -3,11 +3,11 @@ package biz.nellemann.hmci.pcm; import java.util.ArrayList; import java.util.List; -public class Network { +public final class Network { - public List clientLpars = new ArrayList<>(); - public List genericAdapters = new ArrayList<>(); - public List sharedAdapters = new ArrayList<>(); - public List virtualEthernetAdapters = new ArrayList<>(); + public final List clientLpars = new ArrayList<>(); + public final List genericAdapters = new ArrayList<>(); + public final List sharedAdapters = new ArrayList<>(); + public final List virtualEthernetAdapters = new ArrayList<>(); } diff --git a/src/main/java/biz/nellemann/hmci/pcm/PcmData.java b/src/main/java/biz/nellemann/hmci/pcm/PcmData.java index 345d558..ee634d4 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/PcmData.java +++ b/src/main/java/biz/nellemann/hmci/pcm/PcmData.java @@ -1,7 +1,7 @@ package biz.nellemann.hmci.pcm; -public class PcmData { +public final class PcmData { - public SystemUtil systemUtil = new SystemUtil(); + public final SystemUtil systemUtil = new SystemUtil(); } diff --git a/src/main/java/biz/nellemann/hmci/pcm/PhysicalProcessorPool.java b/src/main/java/biz/nellemann/hmci/pcm/PhysicalProcessorPool.java index 1d42657..8ffe855 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/PhysicalProcessorPool.java +++ b/src/main/java/biz/nellemann/hmci/pcm/PhysicalProcessorPool.java @@ -2,10 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -import java.util.ArrayList; -import java.util.List; - -public class PhysicalProcessorPool { +public final class PhysicalProcessorPool { @FirstElement public Number assignedProcUnits = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/PowerUtil.java b/src/main/java/biz/nellemann/hmci/pcm/PowerUtil.java index dc292d6..741485e 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/PowerUtil.java +++ b/src/main/java/biz/nellemann/hmci/pcm/PowerUtil.java @@ -3,7 +3,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class PowerUtil { +public final class PowerUtil { @FirstElement public Number powerReading = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/SampleInfo.java b/src/main/java/biz/nellemann/hmci/pcm/SampleInfo.java index 80217c8..5dfc631 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/SampleInfo.java +++ b/src/main/java/biz/nellemann/hmci/pcm/SampleInfo.java @@ -1,6 +1,6 @@ package biz.nellemann.hmci.pcm; -public class SampleInfo { +public final class SampleInfo { public String timeStamp = ""; public Integer status = 0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/ServerMemory.java b/src/main/java/biz/nellemann/hmci/pcm/ServerMemory.java index dee9616..5aa3324 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/ServerMemory.java +++ b/src/main/java/biz/nellemann/hmci/pcm/ServerMemory.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class ServerMemory { +public final class ServerMemory { @FirstElement public Number totalMem = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/ServerProcessor.java b/src/main/java/biz/nellemann/hmci/pcm/ServerProcessor.java index 7969872..387a971 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/ServerProcessor.java +++ b/src/main/java/biz/nellemann/hmci/pcm/ServerProcessor.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class ServerProcessor { +public final class ServerProcessor { @FirstElement public Number totalProcUnits = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/ServerUtil.java b/src/main/java/biz/nellemann/hmci/pcm/ServerUtil.java index cf066d5..d5fab0d 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/ServerUtil.java +++ b/src/main/java/biz/nellemann/hmci/pcm/ServerUtil.java @@ -3,11 +3,11 @@ package biz.nellemann.hmci.pcm; import java.util.ArrayList; import java.util.List; -public class ServerUtil { +public final class ServerUtil { - public ServerProcessor processor = new ServerProcessor(); - public ServerMemory memory = new ServerMemory(); - public PhysicalProcessorPool physicalProcessorPool = new PhysicalProcessorPool(); - public List sharedProcessorPool = new ArrayList<>(); + public final ServerProcessor processor = new ServerProcessor(); + public final ServerMemory memory = new ServerMemory(); + public final PhysicalProcessorPool physicalProcessorPool = new PhysicalProcessorPool(); + public final List sharedProcessorPool = new ArrayList<>(); } diff --git a/src/main/java/biz/nellemann/hmci/pcm/SharedAdapter.java b/src/main/java/biz/nellemann/hmci/pcm/SharedAdapter.java index dfb6f98..d9ac58e 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/SharedAdapter.java +++ b/src/main/java/biz/nellemann/hmci/pcm/SharedAdapter.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class SharedAdapter { +public final class SharedAdapter { public String id = ""; public String type = ""; diff --git a/src/main/java/biz/nellemann/hmci/pcm/SharedProcessorPool.java b/src/main/java/biz/nellemann/hmci/pcm/SharedProcessorPool.java index d39cd6d..aaddbf0 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/SharedProcessorPool.java +++ b/src/main/java/biz/nellemann/hmci/pcm/SharedProcessorPool.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class SharedProcessorPool { +public final class SharedProcessorPool { public String id = ""; public String name = ""; diff --git a/src/main/java/biz/nellemann/hmci/pcm/Storage.java b/src/main/java/biz/nellemann/hmci/pcm/Storage.java index 7dd9240..7b31588 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/Storage.java +++ b/src/main/java/biz/nellemann/hmci/pcm/Storage.java @@ -3,12 +3,12 @@ package biz.nellemann.hmci.pcm; import java.util.ArrayList; import java.util.List; -public class Storage { +public final class Storage { - public List clientLpars = new ArrayList<>(); - public List genericPhysicalAdapters = new ArrayList<>(); - public List genericVirtualAdapters = new ArrayList<>(); - public List fiberChannelAdapters = new ArrayList<>(); - public List virtualFiberChannelAdapters = new ArrayList<>(); + public final List clientLpars = new ArrayList<>(); + public final List genericPhysicalAdapters = new ArrayList<>(); + public final List genericVirtualAdapters = new ArrayList<>(); + public final List fiberChannelAdapters = new ArrayList<>(); + public final List virtualFiberChannelAdapters = new ArrayList<>(); } diff --git a/src/main/java/biz/nellemann/hmci/pcm/SystemFirmware.java b/src/main/java/biz/nellemann/hmci/pcm/SystemFirmware.java index 2938367..aadc923 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/SystemFirmware.java +++ b/src/main/java/biz/nellemann/hmci/pcm/SystemFirmware.java @@ -2,10 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -import java.util.ArrayList; -import java.util.List; - -public class SystemFirmware { +public final class SystemFirmware { @FirstElement public Number utilizedProcUnits = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/SystemUtil.java b/src/main/java/biz/nellemann/hmci/pcm/SystemUtil.java index 783cb93..cebb612 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/SystemUtil.java +++ b/src/main/java/biz/nellemann/hmci/pcm/SystemUtil.java @@ -3,7 +3,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; import com.squareup.moshi.Json; -public class SystemUtil { +public final class SystemUtil { public UtilInfo utilInfo; diff --git a/src/main/java/biz/nellemann/hmci/pcm/Temperature.java b/src/main/java/biz/nellemann/hmci/pcm/Temperature.java index 2edb162..e7b74b2 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/Temperature.java +++ b/src/main/java/biz/nellemann/hmci/pcm/Temperature.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class Temperature { +public final class Temperature { public String entityId = ""; public String entityInstance = ""; diff --git a/src/main/java/biz/nellemann/hmci/pcm/ThermalUtil.java b/src/main/java/biz/nellemann/hmci/pcm/ThermalUtil.java index cdf1143..08cfbfd 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/ThermalUtil.java +++ b/src/main/java/biz/nellemann/hmci/pcm/ThermalUtil.java @@ -3,10 +3,10 @@ package biz.nellemann.hmci.pcm; import java.util.ArrayList; import java.util.List; -public class ThermalUtil { +public final class ThermalUtil { - public List inletTemperatures = new ArrayList<>(); - public List cpuTemperatures = new ArrayList<>(); - public List baseboardTemperatures = new ArrayList<>(); + public final List inletTemperatures = new ArrayList<>(); + public final List cpuTemperatures = new ArrayList<>(); + public final List baseboardTemperatures = new ArrayList<>(); } diff --git a/src/main/java/biz/nellemann/hmci/pcm/UtilInfo.java b/src/main/java/biz/nellemann/hmci/pcm/UtilInfo.java index 39dc0ed..8d655f5 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/UtilInfo.java +++ b/src/main/java/biz/nellemann/hmci/pcm/UtilInfo.java @@ -2,10 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -import java.util.ArrayList; -import java.util.List; - -public class UtilInfo { +public final class UtilInfo { public String version = ""; public String metricType = ""; diff --git a/src/main/java/biz/nellemann/hmci/pcm/UtilSample.java b/src/main/java/biz/nellemann/hmci/pcm/UtilSample.java index 2f9a3d4..c0a1da5 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/UtilSample.java +++ b/src/main/java/biz/nellemann/hmci/pcm/UtilSample.java @@ -5,16 +5,16 @@ import com.serjltt.moshi.adapters.FirstElement; import java.util.ArrayList; import java.util.List; -public class UtilSample { +public final class UtilSample { public String sampleType = ""; - public SampleInfo sampleInfo = new SampleInfo(); - public SystemFirmware systemFirmwareUtil = new SystemFirmware(); - public ServerUtil serverUtil = new ServerUtil(); - public EnergyUtil energyUtil = new EnergyUtil(); - public List viosUtil = new ArrayList<>(); + public final SampleInfo sampleInfo = new SampleInfo(); + public final SystemFirmware systemFirmwareUtil = new SystemFirmware(); + public final ServerUtil serverUtil = new ServerUtil(); + public final EnergyUtil energyUtil = new EnergyUtil(); + public final List viosUtil = new ArrayList<>(); @FirstElement - public LparUtil lparsUtil = new LparUtil(); + public final LparUtil lparsUtil = new LparUtil(); } diff --git a/src/main/java/biz/nellemann/hmci/pcm/ViosMemory.java b/src/main/java/biz/nellemann/hmci/pcm/ViosMemory.java index c9a2831..cb8af1a 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/ViosMemory.java +++ b/src/main/java/biz/nellemann/hmci/pcm/ViosMemory.java @@ -2,7 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class ViosMemory { +public final class ViosMemory { @FirstElement public Number assignedMem = 0.0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/ViosUtil.java b/src/main/java/biz/nellemann/hmci/pcm/ViosUtil.java index ecccba4..e46e991 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/ViosUtil.java +++ b/src/main/java/biz/nellemann/hmci/pcm/ViosUtil.java @@ -1,6 +1,6 @@ package biz.nellemann.hmci.pcm; -public class ViosUtil { +public final class ViosUtil { public String id = ""; public String uuid = ""; @@ -8,9 +8,9 @@ public class ViosUtil { public String state = ""; public Integer affinityScore = 0; - public ViosMemory memory = new ViosMemory(); - public LparProcessor processor = new LparProcessor(); - public Network network = new Network(); - public Storage storage = new Storage(); + public final ViosMemory memory = new ViosMemory(); + public final LparProcessor processor = new LparProcessor(); + public final Network network = new Network(); + public final Storage storage = new Storage(); } diff --git a/src/main/java/biz/nellemann/hmci/pcm/VirtualEthernetAdapter.java b/src/main/java/biz/nellemann/hmci/pcm/VirtualEthernetAdapter.java index d09c7da..afd4a89 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/VirtualEthernetAdapter.java +++ b/src/main/java/biz/nellemann/hmci/pcm/VirtualEthernetAdapter.java @@ -3,7 +3,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -public class VirtualEthernetAdapter { +public final class VirtualEthernetAdapter { public String physicalLocation = ""; public Integer vlanId = 0; diff --git a/src/main/java/biz/nellemann/hmci/pcm/VirtualFiberChannelAdapter.java b/src/main/java/biz/nellemann/hmci/pcm/VirtualFiberChannelAdapter.java index a946805..41dd33d 100644 --- a/src/main/java/biz/nellemann/hmci/pcm/VirtualFiberChannelAdapter.java +++ b/src/main/java/biz/nellemann/hmci/pcm/VirtualFiberChannelAdapter.java @@ -2,10 +2,7 @@ package biz.nellemann.hmci.pcm; import com.serjltt.moshi.adapters.FirstElement; -import java.util.ArrayList; -import java.util.List; - -public class VirtualFiberChannelAdapter { +public final class VirtualFiberChannelAdapter { public String wwpn = ""; public String wwpn2 = "";