yyyymmddHHMMSS
- * yyyymmddHHMMSS.mmmmmmsUUU) to an OffsetDateTime object
- *
- * @param stringValue String value with a CIM_DATETIME
- * @return OffsetDateTime instance
- */
- public static OffsetDateTime convertCimDateTime(final String stringValue) {
-
- if (stringValue == null) {
- return null;
- }
-
- final Matcher dateTimeMatcher = CIM_DATETIME_PATTERN.matcher(stringValue);
- if (!dateTimeMatcher.find()) {
- throw new IllegalArgumentException("Not a valid CIM_DATETIME value: " + stringValue);
- }
-
- // LocalDateTime
- final LocalDateTime localDateTime = LocalDateTime.parse(dateTimeMatcher.group(1), WBEM_CIM_DATETIME_FORMATTER);
-
- // Note: we're not taking the milliseconds and microseconds into account from
- // group(2)
-
- // Zone Offset
- final String zoneOffset = dateTimeMatcher.group(3);
- if (zoneOffset == null) {
- throw new IllegalStateException(
- "Unable to get the timezone offset from CIM_DATETIME value: " + stringValue);
- }
- final int secondsOffset = Integer.parseInt(zoneOffset) * 60;
- final ZoneOffset offset = ZoneOffset.ofTotalSeconds(secondsOffset);
-
- return OffsetDateTime.of(localDateTime, offset);
- }
-
-}
+package org.metricshub.wbem.client;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Utils {
+
+ /**
+ * Check if the required argument is not null.
+ *
+ * @param argument
+ * @param name
+ * @throws IllegalArgumentException if the argument is null
+ */
+ public static yyyymmddHHMMSS
+ * yyyymmddHHMMSS.mmmmmmsUUU) to an OffsetDateTime object
+ *
+ * @param stringValue String value with a CIM_DATETIME
+ * @return OffsetDateTime instance
+ */
+ public static OffsetDateTime convertCimDateTime(final String stringValue) {
+ if (stringValue == null) {
+ return null;
+ }
+
+ final Matcher dateTimeMatcher = CIM_DATETIME_PATTERN.matcher(stringValue);
+ if (!dateTimeMatcher.find()) {
+ throw new IllegalArgumentException("Not a valid CIM_DATETIME value: " + stringValue);
+ }
+
+ // LocalDateTime
+ final LocalDateTime localDateTime = LocalDateTime.parse(dateTimeMatcher.group(1), WBEM_CIM_DATETIME_FORMATTER);
+
+ // Note: we're not taking the milliseconds and microseconds into account from
+ // group(2)
+
+ // Zone Offset
+ final String zoneOffset = dateTimeMatcher.group(3);
+ if (zoneOffset == null) {
+ throw new IllegalStateException("Unable to get the timezone offset from CIM_DATETIME value: " + stringValue);
+ }
+ final int secondsOffset = Integer.parseInt(zoneOffset) * 60;
+ final ZoneOffset offset = ZoneOffset.ofTotalSeconds(secondsOffset);
+
+ return OffsetDateTime.of(localDateTime, offset);
+ }
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/client/WbemCimDataHandler.java b/src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java
similarity index 60%
rename from src/main/java/org/sentrysoftware/wbem/client/WbemCimDataHandler.java
rename to src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java
index e97dfc3..2495289 100644
--- a/src/main/java/org/sentrysoftware/wbem/client/WbemCimDataHandler.java
+++ b/src/main/java/org/metricshub/wbem/client/WbemCimDataHandler.java
@@ -1,185 +1,186 @@
-package org.sentrysoftware.wbem.client;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program. If not, see
- * CIMParameter used for a
- * method invocation. A CIMArgument has a name, data type and
- * value. A CIMArgument corresponds to a CIMParameter
- * defined for a CIMMethod.
- *
- * @param CIMArgument to be used for method invocations.
- * A CIMArgument corresponds to a CIMParameter.
- * For each CIMParameter being populated during a method
- * invocation a CIMArgument object must be created.
- *
- * @param pName
- * Name of the CIM argument.
- * @param pType
- * CIMDataType of the argument.
- * @param pValue
- * Value of the argument.
- * @throws IllegalArgumentException
- * If the value does not match the type.
- * @see CIMParameter
- */
- public CIMArgument(String pName, CIMDataType pType, E pValue) throws IllegalArgumentException {
- super(pName, pType, pValue);
- }
-
- /**
- * Compares this object against the specified object. The result is
- * true if and only if the argument is not null
- * and is a CIMArgument that represents the same name, type and
- * value as this CIMArgument.
- *
- * @param pObj
- * The object to compare with.
- * @return true if the objects are the same; false
- * otherwise.
- */
- @Override
- public boolean equals(Object pObj) {
- if (!(pObj instanceof CIMArgument)) return false;
- return super.equals(pObj);
- }
-}
+/*
+ (C) Copyright IBM Corp. 2006, 2012
+
+ THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
+ ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
+ CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
+
+ You can obtain a current copy of the Eclipse Public License from
+ http://www.opensource.org/licenses/eclipse-1.0.php
+
+ @author : Endre Bak, ebak@de.ibm.com
+ *
+ * Flag Date Prog Description
+ * -------------------------------------------------------------------------------
+ * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant
+ * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
+ * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
+ * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al
+ * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0
+ * 2944839 2010-02-08 blaschke-oss Remove redundant toString() methods
+ * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues
+ * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods
+ */
+
+package org.metricshub.wbem.javax.cim;
+
+/*-
+ * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
+ * WBEM Java Client
+ * ჻჻჻჻჻჻
+ * Copyright 2023 - 2025 MetricsHub
+ * ჻჻჻჻჻჻
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
+ */
+
+//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010
+/**
+ * This class represents an instance of a CIMParameter used for a
+ * method invocation. A CIMArgument has a name, data type and
+ * value. A CIMArgument corresponds to a CIMParameter
+ * defined for a CIMMethod.
+ *
+ * @param CIMArgument to be used for method invocations.
+ * A CIMArgument corresponds to a CIMParameter.
+ * For each CIMParameter being populated during a method
+ * invocation a CIMArgument object must be created.
+ *
+ * @param pName
+ * Name of the CIM argument.
+ * @param pType
+ * CIMDataType of the argument.
+ * @param pValue
+ * Value of the argument.
+ * @throws IllegalArgumentException
+ * If the value does not match the type.
+ * @see CIMParameter
+ */
+ public CIMArgument(String pName, CIMDataType pType, E pValue) throws IllegalArgumentException {
+ super(pName, pType, pValue);
+ }
+
+ /**
+ * Compares this object against the specified object. The result is
+ * true if and only if the argument is not null
+ * and is a CIMArgument that represents the same name, type and
+ * value as this CIMArgument.
+ *
+ * @param pObj
+ * The object to compare with.
+ * @return true if the objects are the same; false
+ * otherwise.
+ */
+ @Override
+ public boolean equals(Object pObj) {
+ if (!(pObj instanceof CIMArgument)) return false;
+ return super.equals(pObj);
+ }
+}
diff --git a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMClass.java b/src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java
similarity index 83%
rename from src/main/java/org/sentrysoftware/wbem/javax/cim/CIMClass.java
rename to src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java
index 24f06e5..40291e1 100644
--- a/src/main/java/org/sentrysoftware/wbem/javax/cim/CIMClass.java
+++ b/src/main/java/org/metricshub/wbem/javax/cim/CIMClass.java
@@ -1,575 +1,602 @@
-/*
- (C) Copyright IBM Corp. 2006, 2013
-
- THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
- ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
- CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
-
- You can obtain a current copy of the Eclipse Public License from
- http://www.opensource.org/licenses/eclipse-1.0.php
-
- @author : Endre Bak, ebak@de.ibm.com
- *
- * Flag Date Prog Description
- * -------------------------------------------------------------------------------
- * 1565892 2006-10-06 ebak Make SBLIM client JSR48 compliant
- * 1669961 2006-04-16 lupusalex CIMTypedElement.getType() =>getDataType()
- * 1737123 2007-06-15 ebak Differences to JSR48 public review draft
- * 1783288 2007-09-10 ebak CIMClass.isAssociation() not working for retrieved classes.
- * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
- * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
- * 2750520 2009-04-10 blaschke-oss Code cleanup from empty statement et al
- * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors
- * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
- * 2823494 2009-08-03 rgummada Change Boolean constructor to static
- * 2935258 2010-01-22 blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0
- * 2944842 2010-02-08 blaschke-oss Missing thrown ArrayIndexOutOfBoundsException
- * 2975917 2010-03-24 blaschke-oss TCK: CIMClass.getProperty() does not handle null property
- * 3400209 2011-08-31 blaschke-oss Highlighted Static Analysis (PMD) issues
- * 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
- * 3500619 2012-03-16 blaschke-oss JSR48 1.0.0: CIMClass association/key clean up
- * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
- * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods
- * 2719 2013-12-10 blaschke-oss TCK: CIM APIs should not generate NullPointerException
- * 2716 2013-12-11 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final V
- */
-
-package org.sentrysoftware.wbem.javax.cim;
-
-/*-
- * ╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲
- * WBEM Java Client
- * ჻჻჻჻჻჻
- * Copyright (C) 2023 Sentry Software
- * ჻჻჻჻჻჻
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program. If not, see
- * CIMClass has the following attributes:
- * null if no superclass)pIsAssociation and
- * pIsKeyed parameters. If an invalid value is supplied (i.e.
- * the class is an association, but the pIsAssociation was set
- * to false), it may or may not be corrected.
- *
- * @param pPath
- * Object Name of the CIM class.
- * @param pSuperClass
- * Name of the superclass.
- * @param pQualifiers
- * List of qualifiers of the CIM class.
- * @param pProperties
- * List of properties of the CIM class.
- * @param pMethods
- * List of methods of the CIM class.
- * @param pIsAssociation
- * true if the CIM class is an Association,
- * false otherwise.
- * @param pIsKeyed
- * true if the CIM class has Keys,
- * false otherwise.
- * @throws IllegalArgumentException
- * If pPath is null.
- *
- */
- public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQualifiers,
- CIMClassProperty[] pProperties, CIMMethod[] pMethods, boolean pIsAssociation,
- boolean pIsKeyed) {
- this(pPath, pSuperClass, pQualifiers, pProperties, pMethods);
- // if (this.isAssociation() != pIsAssociation) {
- // throw new IllegalArgumentException(
- // "pIsAssociation does not match pQualifiers! pIsAssociation is " +
- // pIsAssociation
- // + " while pQualifiers "
- // + (this.isAssociation() ? "contains" : "does not contain")
- // + " qualifier with association in class " +
- // this.iObjPath.getObjectName());
- // }
- // if (this.isKeyed() != pIsKeyed) {
- // throw new IllegalArgumentException(
- // "pIsKeyed does not match pProperties! pIsKeyed is " + pIsKeyed
- // + " while pProperties "
- // + (this.isKeyed() ? "contains" : "does not contain")
- // + " property with key qualifier in class " +
- // this.iObjPath.getObjectName());
- // }
- }
-
- /**
- * Creates and instantiates a Java object representing a CIM Class. This
- * constructor will inspect the class to determine if it is an association
- * or has keys.
- *
- * @param pName
- * Name of the CIM class.
- * @param pSuperClass
- * Name of the superclass.
- * @param pQualifiers
- * List of qualifiers of the CIM class.
- * @param pProperties
- * List of properties of the CIM class.
- * @param pMethods
- * List of methods of the CIM class.
- * @throws IllegalArgumentException
- * If pName is null.
- */
- public CIMClass(String pName, String pSuperClass, CIMQualifier[] pQualifiers,
- CIMClassProperty[] pProperties, CIMMethod[] pMethods) {
- this(new CIMObjectPath(null, null, null, null, pName, null), pSuperClass, pQualifiers,
- pProperties, pMethods);
- }
-
- /**
- * This private constructor does the actual work for the two public
- * constructors and sets the iIsAssoc and iIsKeyed instance variables based
- * on whether there is qualifier with name="Association" and value=true and
- * a property with a qualifier with name="Key" and value=true, respectively.
- */
- private CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier[] pQualifiers,
- CIMClassProperty[] pProperties, CIMMethod[] pMethods) {
- super(pPath == null ? null : pPath.getObjectName());
- this.iObjPath = pPath;
- this.iSuperClass = pSuperClass;
- this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers);
- this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProperties);
- this.iMethods = (CIMMethod[]) CIMElementSorter.sort(pMethods);
- this.iIsAssoc = this.iQualiImpl.hasQualifierValue("Association", Boolean.TRUE);
- this.iIsKeyed = hasKey(pProperties);
- }
-
- /**
- * Indicates whether the specified CIMClass is equal to this
- * CIMClass.
- *
- * @param pObj
- * The CIMClass object with which to compare.
- * @return true if this object is the same as the
- * pObj argument; false otherwise.
- */
- @Override
- public boolean equals(Object pObj) {
- if (!(pObj instanceof CIMClass)) return false;
- CIMClass that = (CIMClass) pObj;
- if (!super.equals(that)) return false;
- if (this.iSuperClass == null ? that.iSuperClass != null : !this.iSuperClass
- .equalsIgnoreCase(that.iSuperClass)) return false;
- if (!this.iQualiImpl.equals(that.iQualiImpl) || !Arrays.equals(this.iProps, that.iProps)
- || !Arrays.equals(this.iMethods, that.iMethods) || this.iIsAssoc != that.iIsAssoc
- || isKeyed() != that.isKeyed()) return false;
- return true;
- }
-
- /**
- * This method returns a new CIMClass with properties filtered
- * according to the input parameters. Inclusion of class origin and
- * qualifiers can also be controlled. Methods will not be included in the
- * class returned.
- *
- * @param pLocalOnly
- * If true only the elements defined in this class
- * are included; otherwise all elements are included.
- * @param pIncludeQualifiers
- * If true qualifiers are included on all elements;
- * otherwise no qualifiers are included.
- * @param pIncludeClassOrigin
- * If true, the ClassOrigin attribute is included.
- * @param pPropertyList
- * If the PropertyList input parameter is not
- * null, the members of the array define one or more
- * Property names. The CIMClass returned does not
- * include elements for any Properties missing from this list. If
- * the PropertyList input parameter is an empty
- * array this signifies that no Properties are included in the
- * class returned. If the PropertyList input
- * parameter is null this specifies that all
- * Properties are included in the class returned. If the
- * PropertyList contains duplicate elements or
- * invalid property names, they are ignored.
- * @return CIMClass matching the requested criteria.
- */
- public CIMClass filterProperties(boolean pLocalOnly, boolean pIncludeQualifiers,
- boolean pIncludeClassOrigin, String[] pPropertyList) {
- ArrayList