@broadcom/mat-analyze-for-zowe-cli 3.1.0 → 4.0.1

package/CHANGELOG.md

@@ -2,8 +2,17 @@
 
 All notable changes to this project are documented in this file.
 
-> **Note:** To use the updated CLI commands, you must first upgrade the MAT REST API by following 
-> the provided upgrade procedure. This applies to all updated and new commands in this release.
+## `4.0.1` - 2026-03-25
+### Bug Fix
+- Resolved an issue where histogram listings were not displayed in responses.
+
+## `4.0.0` - 2026-02-11
+### Added
+- The MAT plug-in for Zowe CLI v3 has been updated to support the MAT REST API SpringBoot v3.
+  (`/matapi/api/v3`, `/api/v3`).
+
+### Bug Fix
+- Fixed issue with displaying numeric values in responses.
 
 ## `3.1.0` - 2025-03-26
 ### Added

package/LICENSE

@@ -1,20 +1,17 @@
-Copyright (c) 2025 Broadcom.  All Rights Reserved.  The term
-"Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+**************************************************************************************
+Copyright © 2025 BROADCOM Inc and/or its subsidiaries.
 
-This software and all information contained therein is
-confidential and proprietary and shall not be duplicated,
-used, disclosed, or disseminated in any way except as
-authorized by the applicable license agreement, without the
-express written permission of Broadcom.  All authorized
-reproductions must be marked with this language.
+This software and all information contained therein is confidential and
+proprietary and shall not be duplicated, used, disclosed or disseminated in any
+way except as authorized by the applicable license agreement, without the
+express written permission of Broadcom. All authorized reproductions must be marked
+with this language.
 
-EXCEPT AS SET FORTH IN THE APPLICABLE LICENSE AGREEMENT, TO
-THE EXTENT PERMITTED BY APPLICABLE LAW, BROADCOM PROVIDES THIS
-SOFTWARE WITHOUT WARRANTY OF ANY KIND, INCLUDING WITHOUT
-LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT WILL BROADCOM
-BE LIABLE TO THE END USER OR ANY THIRD PARTY FOR ANY LOSS OR
-DAMAGE, DIRECT OR INDIRECT, FROM THE USE OF THIS SOFTWARE,
-INCLUDING WITHOUT LIMITATION, LOST PROFITS, BUSINESS
-INTERRUPTION, GOODWILL, OR LOST DATA, EVEN IF BROADCOM IS
-EXPRESSLY ADVISED OF SUCH LOSS OR DAMAGE.
+EXCEPT AS SET FORTH IN THE APPLICABLE LICENSE AGREEMENT, TO THE EXTENT PERMITTED
+BY APPLICABLE LAW, BROADCOM PROVIDES THIS SOFTWARE WITHOUT WARRANTY OF ANY KIND,
+INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL BROADCOM BE LIABLE TO THE END USER
+OR ANY THIRD PARTY FOR ANY LOSS OR DAMAGE, DIRECT OR INDIRECT, FROM THE USE OF
+THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, LOST PROFITS, BUSINESS INTERRUPTION,
+GOODWILL, OR LOST DATA, EVEN IF BROADCOM IS EXPRESSLY ADVISED OF SUCH LOSS OR DAMAGE.
+**************************************************************************************

package/README.md

@@ -75,8 +75,9 @@ You can install the MAT Analyze Plug-in for Zowe CLI from the Zowe Package.
 
 Before starting the installation of the MAT Analyze Plug-in for Zowe CLI, verify that you have:
 
-- Zowe CLI installed.
+- Zowe version 3 (Zowe CLI version 8.x) is installed. 
 - MAT database and the REST API installed, configured, and running.
+> **Note:** To use the updated CLI commands, you must first upgrade the MAT REST API to the latest version by applying MAT PTF with the latest REST API updates. This applies to all updated and new commands in this release.
 - (Optional) To use the automated listing registration and retrieval option through Endevor® footprints, install and configure the Endevor® Web Services and specify the Endevor® web server details in the MAT database configuration.
 
 ## Install the MAT Analyze Plug-in for Zowe CLI From Packages
@@ -336,10 +337,6 @@ Values: a comma separated list of up to 3 values is allowed, max. 64 characters
 `--schedule` _(string)_  
 Specifies the name of the schedule that you want to apply to the monitor profile (maximum 8 characters).
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-Specifies the name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Create the PROFILE1 monitor profile to measure job JOB1 that runs on the AA31 system:
@@ -399,10 +396,6 @@ Values: maximum 12 characters, numbers only (0-9). If you use this parameter for
 `--listing` _(boolean)_  
 Activates automated registration of Cobol, C/C++, and Assembler program listings through Endevor® footprints. After completion of the measurement that you invoke with the '--listing' parameter, the MAT Analyze plug-in for Zowe CLI automatically retrieves the program listing that is associated with the monitored job and registers the listing with MAT. A registered program listing enhances the analysis possibilities of the 'codeview histogram' command and enables you to inspect the source code statements that are associated with specific modules and CSECTs.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` (string)  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Invoke the PROFILE1 monitor profile to measure job JOB1 that runs on the AA31 system:
@@ -439,10 +432,6 @@ Get the list of available monitor profiles.
 $ zowe mat profile list [options]
 ```
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 ## MONITOR
 
 The commands from the MONITOR group enable you to get monitor history and measurement analysis data from MAT.
@@ -469,10 +458,6 @@ $ zowe mat monitor history [options]
 `--profile` _(string)_  
 Specifies the name of the profile.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the list of all available measurements that are stored in the history of the monitor profile TESTPROF:
@@ -504,10 +489,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the measurement overview details for monitor number 5:
@@ -559,10 +540,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the DelayView measurement details for monitor number 5:
@@ -601,33 +578,29 @@ Specifies the name of the profile that you want to analyze. When you specify the
 Specifies the unique monitor number of the measurement.
 
 `--majorcategory` _(string)_  
-Specifies the major delay category name identified for the analysis item (e.g. `–-majorcategory "PC routine delay"`). You get the majorcategory value from the 'delayview delay' command response.
+Specifies the major delay category name identified for the analysis item (e.g. `--majorcategory "PC routine delay"`). You get the majorcategory value from the 'delayview delay' command response.
 
 `--minorcategory` _(string)_  
-Specifies the minor delay category name identified for the analysis item (e.g. `–-minorcategory "PC CALL"`). You get the minorcategory value from the 'delayview delay' command response.
-
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
+Specifies the minor delay category name identified for the analysis item (e.g. `---minorcategory "PC CALL"`). You get the minorcategory value from the 'delayview delay' command response.
 
 **Examples**
 
 - Get the delay address details for majorcategory "PC routine delay" and minorcategory "PC CALL" for monitor number 5:
 
 ```
-$ zowe mat monitor delayview address --mon_num 5 –-majorcategory "PC routine delay" –-minorcategory "PC CALL"
+$ zowe mat monitor delayview address --mon_num 5 --majorcategory "PC routine delay" --minorcategory "PC CALL"
 ```
 
 - Get the delay address details for majorcategory "PC routine delay" and minorcategory "PC CALL" for the latest monitor in the TESTPROF profile:
 
 ```
-$ zowe mat monitor delayview address --profile TESTPROF –-majorcategory "PC routine delay" –-minorcategory "PC CALL"
+$ zowe mat monitor delayview address --profile TESTPROF --majorcategory "PC routine delay" --minorcategory "PC CALL"
 ```
 
 - Get the delay address details for majorcategory "PC routine delay" and minorcategory "PC CALL" for monitor number 5, with the specific MAT profile details defined:
 
 ```
-$ zowe mat monitor delayview address --mon_num 5 –-majorcategory "PC routine delay" –-minorcategory "PC CALL" --host "example.com" --port 12345 --user johndoe --password qwerty
+$ zowe mat monitor delayview address --mon_num 5 --majorcategory "PC routine delay" --minorcategory "PC CALL" --host "example.com" --port 12345 --user johndoe --password qwerty
 ```
 
 ### adabas | ada
@@ -647,10 +620,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the Adabas measurement details for monitor number 5:
@@ -700,10 +669,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the CodeView measurement details in Module mode for monitor number 5:
@@ -741,10 +706,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the CodeView measurement details in CSECT mode for monitor number 5:
@@ -782,10 +743,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the CodeView measurement details in Natural mode for monitor number 5:
@@ -826,10 +783,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the CodeView measurement details in Ideal mode for monitor number 5:
@@ -873,10 +826,6 @@ Specifies the module name that you request the CallerID details for. You get the
 `--csect` _(string)_  
 Specifies the CSECT name that you request the CallerID details data for. You get the csect value from the 'codeview csect' command response. The CSECT name can be empty (e.g., --csect "TUNCOB01" or --csect '""').
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the CallerID details for monitor number 5, CSECT name TUNCOB01, and module name RUNCOB:
@@ -940,10 +889,6 @@ Specifies the histogram group size parameter that defines the resolution of the
 `--listing` _(boolean)_  
 Enables you to retrieve program listing details that pertain to the specific CSECT and statement. To use the listing retrieval option, you must install and configure the Endevor® Web Services and have the program listing for the specific measurement registered with MAT. The source code listing is retrieved through Endevor® footprints for Cobol, C/C++, and Assembler programs. The program listing file is downloaded to your local directory that you specified with the 'listingDir' parameter for your MAT configuration profile. When you request the histogram details with the '--listing' option, the 'histogram' command returns the additional 'listing' column that contains a reference to the program listing with the specific CSECT name, program type, line and column number that pertain to the requested CSECT and statement, for example, c:\listings\SA420LE.asm:382:51. If you use Visual Studio Code (VS Code) IDE, you can click on the reference in the command response in your VS Code terminal to navigate directly to the indicated source program location. The --listing parameter is optional.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the Histogram measurement details in CSECT mode with the group size defaulting to 4 bytes for monitor 
@@ -1005,10 +950,6 @@ Specifies the object version that you request the Histogram data for. You get th
 Specifies the source version that you request the Histogram data for. You get the source version from the
 'codeview ideal' command response. This is mandatory option.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the Histogram data in Ideal mode for monitor number 5, system ID '$ID', program name 'BAGTEST2', object version 'PRD', source version '001':
@@ -1055,10 +996,6 @@ Specifies the library name that you request the Histogram data for. You get the
 Specifies the routine name that you request the Histogram data for. You get the routine name from the
 'codeview natural' command response. This is mandatory option.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the Histogram data in Natural mode for monitor number 5, library name 'CATAPPS', routine name 'IFEX1R':
@@ -1112,10 +1049,6 @@ Specifies the unique monitor number of the measurement.
 `--top` _(number)_  
 Specifies the maximum number of the top consuming DB2 statements that you want to obtain in the response (e.g., --top 5). If you specify --top 0, you get the list of of all DB2 statements that MAT has detected during the measurement. The --top parameter is optional. Values: numbers between 0 and 300.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the DB2View details for monitor number 5:
@@ -1162,10 +1095,6 @@ Specifies the statement number that you request the SQL details for (e.g., `--st
 `--totalsamps` _(number)_  
 Specifies the total number of samples taken for the requested statement (e.g., `--totalsamps 1`). You get the totalsamps value from the 'db2 db2view' command response.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the DB2 SQL statement details for monitor number 5 for DBRM CUPBTSDY, statement number 464, with total number of taken samples 1:
@@ -1215,10 +1144,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the dml measurement details for the latest monitor in the TESTPROF profile:
@@ -1262,10 +1187,6 @@ Specifies the identifier of the Run Unit that you request the details for.
 `--linecmd` _(string)_  
 Specifies the line command to be used for the row data.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the idms details of the measurement for the latest monitor in the profile:
@@ -1303,10 +1224,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 Get the idms measurement details in Task mode for monitor number 5:
@@ -1350,10 +1267,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the IMS View details for monitor number 5:
@@ -1385,10 +1298,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the IMS View DBDName details for monitor number 5:
@@ -1420,10 +1329,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the IMS View PSBName details for monitor number 5:
@@ -1455,10 +1360,6 @@ Specifies the name of the profile that you want to analyze. When you specify the
 `--mon_num` _(number)_  
 Specifies the unique monitor number of the measurement.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the IMS View Region details for monitor number 5:
@@ -1499,10 +1400,6 @@ Specifies the database details for the specified monitor number or profile name.
 `--psbname` _(string)_  
 Specifies the PSB name details for the specified monitor number or profile name.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the IMS View SSA details for monitor number 5 with the specific MAT profile details defined:
@@ -1537,10 +1434,6 @@ Specifies the unique monitor number of the measurement.
 `--trancode` _(string)_  
 Specifies the transaction name for specified monitor number or profile name.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the IMS View Statement details for monitor number 5 with trancode:
@@ -1587,10 +1480,6 @@ Specifies the unique monitor number of the measurement.
 `--tran` _(string)_  
 Specifies the transaction activity. Tran = N/A is displayed for the activity that could not be attributed to a particular transaction in the address space.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the TranView measurement details for monitor number 5:
@@ -1625,10 +1514,6 @@ Specifies the unique monitor number of the measurement.
 `--tran` _(string)_  
 Specifies the transaction activity. Tran = N/A is displayed for the activity that could not be attributed to a particular transaction in the address space.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the idms details of the measurement for the latest monitor in the profile:
@@ -1669,10 +1554,6 @@ Specifies the unique monitor number of the measurement.
 `--tran` _(string)_  
 Specifies the transaction activity. Tran = N/A is displayed for the activity that could not be attributed to a particular transaction in the address space.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the caller details for monitor number 5:
@@ -1707,10 +1588,6 @@ Specifies the unique monitor number of the measurement.
 `--tran` _(string)_  
 Specifies the transaction activity. Tran = N/A is displayed for the activity that could not be attributed to a particular transaction in the address space.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the callstack details for monitor number 5:
@@ -1745,10 +1622,6 @@ Specifies the unique monitor number of the measurement.
 `--tran` _(string)_  
 Specifies the transaction activity. Tran = N/A is displayed for the activity that could not be attributed to a particular transaction in the address space.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the CodeView details for transaction in CSECT mode for monitor number 5:
@@ -1789,10 +1662,6 @@ Specifies the unique monitor number of the measurement.
 `--tran` _(string)_  
 Specifies the transaction activity. Tran = N/A is displayed for the activity that could not be attributed to a particular transaction in the address space.
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the DelayView measurement details of a transaction for monitor number 5:
@@ -1837,10 +1706,6 @@ Specifies the transaction activity. Tran = N/A is displayed for the activity tha
 Specifies the type of CICS Transaction.
 Default value: DISP
 
-**Profile Options**  
-`--mat-profile` | `--mat-p` _(string)_  
-The name of a (mat) profile to load for this command execution.
-
 **Examples**
 
 - Get the CICS statistic details for monitor number 5:

package/lib/api/MATRest.d.ts

@@ -2,8 +2,8 @@ import { AbstractSession } from "@zowe/imperative";
 import { IAuth } from "./response/IAuth";
 import { IResponse } from "./response/IResponse";
 export declare class MATRest {
-    static readonly REST_ENDPOINT = "/matapi/api/v2";
-    static readonly REST_ENDPOINT_AML = "/api/v2";
+    static readonly REST_ENDPOINT = "/matapi/api/v3";
+    static readonly REST_ENDPOINT_AML = "/api/v3";
     static readonly PROFILES = "/profiles";
     static readonly INVOKEURI = "/invoke";
     static readonly JOBURI = "/job";

package/lib/api/MATRest.js

@@ -1,25 +1,23 @@
 "use strict";
 /*
- * Copyright (c) 2025 Broadcom.  All Rights Reserved.  The term
- * "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+ * **************************************************************************************
+ * Copyright © 2025 BROADCOM Inc and/or its subsidiaries.
  *
- * This software and all information contained therein is
- * confidential and proprietary and shall not be duplicated,
- * used, disclosed, or disseminated in any way except as
- * authorized by the applicable license agreement, without the
- * express written permission of Broadcom.  All authorized
- * reproductions must be marked with this language.
+ * This software and all information contained therein is confidential and
+ * proprietary and shall not be duplicated, used, disclosed or disseminated in any
+ * way except as authorized by the applicable license agreement, without the
+ * express written permission of Broadcom. All authorized reproductions must be marked
+ * with this language.
+ *
+ * EXCEPT AS SET FORTH IN THE APPLICABLE LICENSE AGREEMENT, TO THE EXTENT PERMITTED
+ * BY APPLICABLE LAW, BROADCOM PROVIDES THIS SOFTWARE WITHOUT WARRANTY OF ANY KIND,
+ * INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT WILL BROADCOM BE LIABLE TO THE END USER
+ * OR ANY THIRD PARTY FOR ANY LOSS OR DAMAGE, DIRECT OR INDIRECT, FROM THE USE OF
+ * THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, LOST PROFITS, BUSINESS INTERRUPTION,
+ * GOODWILL, OR LOST DATA, EVEN IF BROADCOM IS EXPRESSLY ADVISED OF SUCH LOSS OR DAMAGE.
+ * **************************************************************************************
  *
- * EXCEPT AS SET FORTH IN THE APPLICABLE LICENSE AGREEMENT, TO
- * THE EXTENT PERMITTED BY APPLICABLE LAW, BROADCOM PROVIDES THIS
- * SOFTWARE WITHOUT WARRANTY OF ANY KIND, INCLUDING WITHOUT
- * LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT WILL BROADCOM
- * BE LIABLE TO THE END USER OR ANY THIRD PARTY FOR ANY LOSS OR
- * DAMAGE, DIRECT OR INDIRECT, FROM THE USE OF THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, LOST PROFITS, BUSINESS
- * INTERRUPTION, GOODWILL, OR LOST DATA, EVEN IF BROADCOM IS
- * EXPRESSLY ADVISED OF SUCH LOSS OR DAMAGE.
  */
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -33,6 +31,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MATRest = void 0;
 const imperative_1 = require("@zowe/imperative");
+const HttpError_1 = require("./error/HttpError");
 class MATRest {
     // public static async GetAuth(session: AbstractSession, username: string, password: string, endpoint: string): Promise<IAuth> {
     static GetAuth(session, endpoint) {
@@ -45,6 +44,7 @@ class MATRest {
     // tslint:disable-next-line:max-line-length
     static sendGetRequest(session, resource, headers, parameters) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             let appendix = "";
             if (parameters !== undefined && parameters.size) {
                 appendix += "?";
@@ -59,14 +59,30 @@ class MATRest {
                     appendix += key + "=" + value + (int < parameters.size ? "&" : "");
                 }
             }
-            let response = yield imperative_1.RestClient.getExpectString(session, resource + appendix, headers);
+            // full response with HTTP status
+            const fullResponse = yield imperative_1.RestClient.getExpectFullResponse(session, {
+                resource: resource + appendix,
+                reqHeaders: headers !== null && headers !== void 0 ? headers : []
+            });
+            const code = (_a = fullResponse === null || fullResponse === void 0 ? void 0 : fullResponse.response) === null || _a === void 0 ? void 0 : _a.statusCode;
+            // stash code
+            session.__mat_httpStatusCode = code;
+            let response = (_b = fullResponse === null || fullResponse === void 0 ? void 0 : fullResponse.dataString) !== null && _b !== void 0 ? _b : "";
+            if (!response || response.trim() === "") {
+                if (code === 204) {
+                    throw new HttpError_1.HttpError("No data is available for the measurement.", 204);
+                }
+                return null;
+            }
             // Replaces number literals with string only for displaying purposes! - This is a limitation of the output formater that doesn't display zeroes
             const matches = response.match(/"([a-zA-Z_]*)":([\d*\.]*\d+)/g);
-            matches.forEach((element) => {
-                const match = element.substring(element.indexOf(":") + 1);
-                const newElement = element.replace(match, "\"" + match + "\"");
-                response = response.replace(element, newElement);
-            });
+            if (matches) {
+                matches.forEach((element) => {
+                    const match = element.substring(element.indexOf(":") + 1);
+                    const newElement = element.replace(match, "\"" + match + "\"");
+                    response = response.replace(element, newElement);
+                });
+            }
             const responseObj = JSON.parse(response);
             return responseObj;
         });
@@ -74,13 +90,25 @@ class MATRest {
     // tslint:disable-next-line:max-line-length
     static sendPostRequest(session, resource, headers, payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield imperative_1.RestClient.postExpectJSON(session, resource, headers, payload);
-            return response;
+            var _a, _b;
+            const full = yield imperative_1.RestClient.postExpectFullResponse(session, {
+                resource,
+                reqHeaders: headers !== null && headers !== void 0 ? headers : [],
+                writeData: payload
+            });
+            // stash HTTP code for the handler
+            session.__mat_httpStatusCode = (_a = full === null || full === void 0 ? void 0 : full.response) === null || _a === void 0 ? void 0 : _a.statusCode;
+            const body = ((_b = full === null || full === void 0 ? void 0 : full.dataString) !== null && _b !== void 0 ? _b : "").trim();
+            if (body === "") {
+                return null;
+            }
+            return JSON.parse(body);
         });
     }
     // tslint:disable-next-line:max-line-length
     static sendPostRequestWithParm(session, resource, headers, parameters, payload) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             let appendix = "";
             if (parameters !== undefined && parameters.size) {
                 appendix += "?";
@@ -92,14 +120,23 @@ class MATRest {
                     appendix += key + "=" + value + (int < parameters.size ? "&" : "");
                 }
             }
-            const response = yield imperative_1.RestClient.postExpectJSON(session, resource + appendix, headers, payload);
-            return response;
+            const full = yield imperative_1.RestClient.postExpectFullResponse(session, {
+                resource: resource + appendix,
+                reqHeaders: headers !== null && headers !== void 0 ? headers : [],
+                writeData: payload
+            });
+            session.__mat_httpStatusCode = (_a = full === null || full === void 0 ? void 0 : full.response) === null || _a === void 0 ? void 0 : _a.statusCode;
+            const body = ((_b = full === null || full === void 0 ? void 0 : full.dataString) !== null && _b !== void 0 ? _b : "").trim();
+            if (body === "") {
+                return null;
+            }
+            return JSON.parse(body);
         });
     }
 }
 exports.MATRest = MATRest;
-MATRest.REST_ENDPOINT = "/matapi/api/v2";
-MATRest.REST_ENDPOINT_AML = "/api/v2";
+MATRest.REST_ENDPOINT = "/matapi/api/v3";
+MATRest.REST_ENDPOINT_AML = "/api/v3";
 MATRest.PROFILES = "/profiles";
 MATRest.INVOKEURI = "/invoke";
 MATRest.JOBURI = "/job";
@@ -139,4 +176,4 @@ MATRest.ANALYSIS_IMSVIEW_DBDNAME = MATRest.ANALYSIS_IMSVIEW + "/dbdname";
 MATRest.ANALYSIS_IMSVIEW_REGION = MATRest.ANALYSIS_IMSVIEW + "/region";
 MATRest.ANALYSIS_IMSVIEW_PSBNAME_SSA = MATRest.ANALYSIS_IMSVIEW + "/psbname/ssa";
 MATRest.TOKEN_OFFSET = 25;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTUFUUmVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGkvTUFUUmVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQXFCRzs7Ozs7Ozs7Ozs7O0FBRUgsaURBQStEO0FBSS9ELE1BQWEsT0FBTztJQTJDaEIsZ0lBQWdJO0lBQ3pILE1BQU0sQ0FBTyxPQUFPLENBQUMsT0FBd0IsRUFBRSxRQUFnQjs7WUFDbEUsTUFBTSxRQUFRLEdBQUcsUUFBUSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7WUFDekMsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFRLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztZQUN0RSxPQUFPLFFBQVEsQ0FBQztRQUNoQixDQUFDO0tBQUE7SUFFTCwyQ0FBMkM7SUFDcEMsTUFBTSxDQUFPLGNBQWMsQ0FBc0IsT0FBd0IsRUFBRSxRQUFnQixFQUFFLE9BQWUsRUFBRSxVQUFnQzs7WUFDakosSUFBSSxRQUFRLEdBQUcsRUFBRSxDQUFDO1lBQ2xCLElBQUksVUFBVSxLQUFLLFNBQVMsSUFBSSxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQzlDLFFBQVEsSUFBSSxHQUFHLENBQUM7Z0JBQ2hCLElBQUksR0FBRyxHQUFHLENBQUMsQ0FBQztnQkFDWixLQUFLLE1BQU0sUUFBUSxJQUFJLFVBQVUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO29CQUMxQyxHQUFHLEVBQUUsQ0FBQztvQkFDTixJQUFJLEdBQUcsR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ3RCLElBQUksR0FBRyxLQUFLLFNBQVMsRUFBRSxDQUFDO3dCQUNwQixHQUFHLEdBQUcsU0FBUyxDQUFDO29CQUNwQixDQUFDO29CQUNELE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDMUIsUUFBUSxJQUFJLEdBQUcsR0FBRyxHQUFH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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTUFUUmVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGkvTUFUUmVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FtQkc7Ozs7Ozs7Ozs7OztBQUVILGlEQUErRDtBQUcvRCxpREFBOEM7QUFFOUMsTUFBYSxPQUFPO0lBMkNoQixnSUFBZ0k7SUFDekgsTUFBTSxDQUFPLE9BQU8sQ0FBQyxPQUF3QixFQUFFLFFBQWdCOztZQUNsRSxNQUFNLFFBQVEsR0FBRyxRQUFRLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztZQUN6QyxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxlQUFlLENBQVEsT0FBTyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBQ3RFLE9BQU8sUUFBUSxDQUFDO1FBQ2hCLENBQUM7S0FBQTtJQUVMLDJDQUEyQztJQUNwQyxNQUFNLENBQU8sY0FBYyxDQUFzQixPQUF3QixFQUFFLFFBQWdCLEVBQUUsT0FBZSxFQUFFLFVBQWdDOzs7WUFDakosSUFBSSxRQUFRLEdBQUcsRUFBRSxDQUFDO1lBQ2xCLElBQUksVUFBVSxLQUFLLFNBQVMsSUFBSSxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQzlDLFFBQVEsSUFBSSxHQUFHLENBQUM7Z0JBQ2hCLElBQUksR0FBRyxHQUFHLENBQUMsQ0FBQztnQkFDWixLQUFLLE1BQU0sUUFBUSxJQUFJLFVBQVUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO29CQUMxQyxHQUFHLEVBQUUsQ0FBQztvQkFDTixJQUFJLEdBQUcsR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7b0JBQ3RCLElBQUksR0FBRyxLQUFLLFNBQVMsRUFBRSxDQUFDO3dCQUNwQixHQUFHLEdBQUcsU0FBUyxDQUFDO29CQUNwQixDQUFDO29CQUNELE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDMUIsUUFBUSxJQUFJLEdB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