- Working on v2 parser

2025-12-08 20:16:21 +00:00 · 2019-11-13 21:36:54 +01:00 · 2019-11-13 21:36:54 +01:00 · 1f769b064c
commit 1f769b064c
parent 6e37ccb2ee
50 changed files with 1772 additions and 6081 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -12,6 +12,7 @@
    },
    "rules": {
        "@typescript-eslint/no-explicit-any": 0,
+        "@typescript-eslint/no-inferrable-types": 0,
        "@typescript-eslint/no-non-null-assertion": 0,
        "@typescript-eslint/explicit-function-return-type": 0,
        "prettier/prettier": [
--- a/src/client/interfaces/Schema.d.ts
+++ b/src/client/interfaces/Schema.d.ts
@ -1,7 +1,15 @@
+import { Dictionary } from '../../utils/types';
+
 export interface Schema {
    type: string;
    base: string;
    template: string | null;
+    description?: string;
    default?: any;
+    required: boolean;
+    nullable: boolean;
+    readOnly: boolean;
+    extends: string[];
    imports: string[];
+    properties: Dictionary<Schema>;
 }
--- a/src/index.ts
+++ b/src/index.ts
@ -1,12 +1,11 @@
 import * as path from 'path';
 import { parse as parseV2 } from './openApi/v2';
 import { parse as parseV3 } from './openApi/v3';
-import { readHandlebarsTemplates } from './utils/readHandlebarsTemplates';
+import { readHandlebarsTemplates, Templates } from './utils/readHandlebarsTemplates';
 import { getOpenApiSpec } from './utils/getOpenApiSpec';
 import { writeClient } from './utils/writeClient';
-import * as os from 'os';
-import chalk from 'chalk';
 import { getOpenApiVersion, OpenApiVersion } from './utils/getOpenApiVersion';
+import { Client } from './client/interfaces/Client';

 export enum Language {
    TYPESCRIPT = 'typescript',
@ -28,8 +27,8 @@ export enum HttpClient {
 * @param httpClient: The selected httpClient (fetch or XHR)
 */
 export function generate(input: string, output: string, language: Language = Language.TYPESCRIPT, httpClient: HttpClient = HttpClient.FETCH): void {
-    const inputPath = path.resolve(process.cwd(), input);
-    const outputPath = path.resolve(process.cwd(), output);
+    const inputPath: string = path.resolve(process.cwd(), input);
+    const outputPath: string = path.resolve(process.cwd(), output);

    // console.log(chalk.bold.green('Generate:'));
    // console.log(chalk.grey('  Input:'), input);
@ -41,22 +40,22 @@ export function generate(input: string, output: string, language: Language = Lan
    try {
        // Load the specification, read the OpenAPI version and load the
        // handlebar templates for the given language
-        const openApi = getOpenApiSpec(inputPath);
-        const openApiVersion = getOpenApiVersion(openApi);
-        const templates = readHandlebarsTemplates(language);
+        const openApi: any = getOpenApiSpec(inputPath);
+        const openApiVersion: OpenApiVersion = getOpenApiVersion(openApi);
+        const templates: Templates = readHandlebarsTemplates(language);

        switch (language) {
            case Language.JAVASCRIPT:
            case Language.TYPESCRIPT:
                // Generate and write version 2 client
                if (openApiVersion === OpenApiVersion.V2) {
-                    const clientV2 = parseV2(openApi);
+                    const clientV2: Client = parseV2(openApi);
                    writeClient(clientV2, language, templates, outputPath);
                }

                // Generate and write version 3 client
                if (openApiVersion === OpenApiVersion.V3) {
-                    const clientV3 = parseV3(openApi);
+                    const clientV3: Client = parseV3(openApi);
                    writeClient(clientV3, language, templates, outputPath);
                }
        }
--- a/src/openApi/v2/parser/getArrayType.ts
+++ b/src/openApi/v2/parser/getArrayType.ts
@ -5,18 +5,21 @@ import { getEnumType } from './getEnumType';
 import { ArrayType } from '../../../client/interfaces/ArrayType';

 export function getArrayType(items: OpenApiItems): ArrayType {
-    let itemsType = 'any';
-    let itemsBase = 'any';
-    let itemsTemplate: string | null = null;
-    let itemsImports: string[] = [];
+    const result: ArrayType = {
+        type: 'any',
+        base: 'any',
+        template: null,
+        default: items.default,
+        imports: [],
+    };

    // If the parameter has a type than it can be a basic or generic type.
    if (items.type) {
        const itemsData: Type = getType(items.type);
-        itemsType = itemsData.type;
-        itemsBase = itemsData.base;
-        itemsTemplate = itemsData.template;
-        itemsImports = [...itemsData.imports];
+        result.type = itemsData.type;
+        result.base = itemsData.base;
+        result.template = itemsData.template;
+        result.imports.push(...itemsData.imports);

        // If the parameter is an Array type, we check for the child type,
        // so we can create a typed array, otherwise this will be a "any[]".
@ -32,14 +35,10 @@ export function getArrayType(items: OpenApiItems): ArrayType {
    }

    if (items.enum) {
-        itemsType = getEnumType(items.enum, true);
+        result.type = getEnumType(items.enum, true);
+        result.base = 'string';
+        result.imports = [];
    }

-    return {
-        type: itemsType,
-        base: itemsBase,
-        template: itemsTemplate,
-        default: items.default,
-        imports: itemsImports,
-    };
+    return result;
 }
--- a/src/openApi/v2/parser/getEnumTypeFromDescription.ts
+++ b/src/openApi/v2/parser/getEnumTypeFromDescription.ts
@ -1,31 +1,33 @@
-export function getEnumTypeFromDescription(description: string, addParentheses = false): string | null {
+export function getEnumTypeFromDescription(description: string, addParentheses: boolean = false): string | null {
    // Check if we can find this special format string:
    // None=0,Something=1,AnotherThing=2
-    const matches: RegExpMatchArray | null = description.match(/((\w+)=([0-9]+)(?:,|$))/g);
-    if (matches) {
-        // Grab the values from the description
-        const values: number[] = [];
-        for (let i = 0, n = matches.length; i < n; i++) {
-            const value = parseInt(matches[i].split('=')[1].replace(/[^0-9]/g, ''));
-            if (Number.isInteger(value)) {
-                values.push(value);
+    if (/^(\w+=[0-9]+,?)+$/g.test(description)) {
+        const matches: RegExpMatchArray | null = description.match(/(\w+=[0-9]+,?)/g);
+        if (matches) {
+            // Grab the values from the description
+            const values: number[] = [];
+            matches.forEach(match => {
+                const value = parseInt(match.split('=')[1].replace(/[^0-9]/g, ''));
+                if (Number.isInteger(value)) {
+                    values.push(value);
+                }
+            });
+
+            // Filter and sort the values
+            const entries: string[] = values
+                .sort()
+                .filter((name, index, arr) => arr.indexOf(name) === index)
+                .map(value => String(value));
+
+            // Add grouping parentheses if needed. This can be handy if enum values
+            // are used in Arrays, so that you will get the following definition:
+            // const myArray: ('EnumValue1' | 'EnumValue2' | 'EnumValue3')[];
+            if (entries.length > 1 && addParentheses) {
+                return `(${entries.join(' | ')})`;
            }
+
+            return entries.join(' | ');
        }
-
-        // Filter and sort the values
-        const entries: string[] = values
-            .sort()
-            .filter((name, index, arr) => arr.indexOf(name) === index)
-            .map(value => String(value));
-
-        // Add grouping parentheses if needed. This can be handy if enum values
-        // are used in Arrays, so that you will get the following definition:
-        // const myArray: ('EnumValue1' | 'EnumValue2' | 'EnumValue3')[];
-        if (entries.length > 1 && addParentheses) {
-            return `(${entries.join(' | ')})`;
-        }
-
-        return entries.join(' | ');
    }

    return null;
--- a/src/openApi/v2/parser/getModelProperty.ts
+++ b/src/openApi/v2/parser/getModelProperty.ts
@ -66,15 +66,15 @@ export function getModelProperty(name: string, schema: OpenApiSchema & OpenApiRe
        // type is enum!
    }

-    console.log('propertyName:', schema);
-    console.log('format:', schema.format);
-    console.log('type:', schema.type);
+    // console.log('propertyName:', schema);
+    // console.log('format:', schema.format);
+    // console.log('type:', schema.type);

    const properties = schema.properties;
    for (const propertyName in properties) {
        if (properties.hasOwnProperty(propertyName)) {
            const property = properties[propertyName];
-            console.log('propertyName', propertyName);
+            /// console.log('propertyName', propertyName);
            // getModelProperty(propertyName, property);
        }
    }
@ -87,7 +87,7 @@ export function getModelProperty(name: string, schema: OpenApiSchema & OpenApiRe
                prop.imports.push(extend.base);
            }
            if (parent.properties) {
-                console.log(parent.properties);
+                // console.log(parent.properties);
                // const properties: ParsedModelProperties = parseModelProperties(modelClass, definition.allOf[1].properties as SwaggerDefinitions, required);
                // model.imports.push(...properties.imports);
                // model.properties.push(...properties.properties);
--- a/src/openApi/v2/parser/getOperation.ts
+++ b/src/openApi/v2/parser/getOperation.ts
@ -15,14 +15,14 @@ import { getOperationErrors } from './getOperationErrors';
 import { OperationError } from '../../../client/interfaces/OperationError';

 export function getOperation(openApi: OpenApi, url: string, method: string, op: OpenApiOperation): Operation {
-    const serviceName = (op.tags && op.tags[0]) || 'Service';
-    const serviceClassName = getServiceClassName(serviceName);
-    const operationNameFallback = `${method}${serviceClassName}`;
-    const operationName = getOperationName(op.operationId || operationNameFallback);
-    const operationPath = getOperationPath(url);
+    const serviceName: string = (op.tags && op.tags[0]) || 'Service';
+    const serviceClassName: string = getServiceClassName(serviceName);
+    const operationNameFallback: string = `${method}${serviceClassName}`;
+    const operationName: string = getOperationName(op.operationId || operationNameFallback);
+    const operationPath: string = getOperationPath(url);

    // Create a new operation object for this method.
-    const operation: Operation = {
+    const result: Operation = {
        service: serviceClassName,
        name: operationName,
        summary: getComment(op.summary),
@ -44,13 +44,13 @@ export function getOperation(openApi: OpenApi, url: string, method: string, op:
    // Parse the operation parameters (path, query, body, etc).
    if (op.parameters) {
        const parameters: OperationParameters = getOperationParameters(openApi, op.parameters);
-        operation.imports.push(...parameters.imports);
-        operation.parameters.push(...parameters.parameters);
-        operation.parametersPath.push(...parameters.parametersPath);
-        operation.parametersQuery.push(...parameters.parametersQuery);
-        operation.parametersForm.push(...parameters.parametersForm);
-        operation.parametersHeader.push(...parameters.parametersHeader);
-        operation.parametersBody = parameters.parametersBody;
+        result.imports.push(...parameters.imports);
+        result.parameters.push(...parameters.parameters);
+        result.parametersPath.push(...parameters.parametersPath);
+        result.parametersQuery.push(...parameters.parametersQuery);
+        result.parametersForm.push(...parameters.parametersForm);
+        result.parametersHeader.push(...parameters.parametersHeader);
+        result.parametersBody = parameters.parametersBody;
    }

    // Parse the operation responses.
@ -58,12 +58,10 @@ export function getOperation(openApi: OpenApi, url: string, method: string, op:
        const responses: OperationResponse[] = getOperationResponses(openApi, op.responses);
        const response: OperationResponse = getOperationResponse(responses);
        const errors: OperationError[] = getOperationErrors(responses);
-        operation.imports.push(...response.imports);
-        operation.errors = errors;
-        operation.result = response.type;
-
-        console.log(operation.result);
+        result.imports.push(...response.imports);
+        result.errors = errors;
+        result.result = response.type;
    }

-    return operation;
+    return result;
 }
--- a/src/openApi/v2/parser/getOperationName.ts
+++ b/src/openApi/v2/parser/getOperationName.ts
@ -6,6 +6,6 @@ import camelCase from 'camelcase';
 * the most popular Javascript and Typescript writing style.
 */
 export function getOperationName(value: string): string {
-    const clean = value.replace(/[^\w\s\-]+/g, '_').trim();
+    const clean: string = value.replace(/[^\w\s\-]+/g, '_').trim();
    return camelCase(clean);
 }
--- a/src/openApi/v2/parser/getOperationParameters.ts
+++ b/src/openApi/v2/parser/getOperationParameters.ts
@ -11,17 +11,18 @@ function sortByRequired(a: Parameter, b: Parameter): number {
 }

 export function getOperationParameters(openApi: OpenApi, parametersOrReferences: (OpenApiParameter & OpenApiReference)[]): OperationParameters {
-    const imports: string[] = [];
-    const parameters: Parameter[] = [];
-    const parametersPath: Parameter[] = [];
-    const parametersQuery: Parameter[] = [];
-    const parametersForm: Parameter[] = [];
-    const parametersHeader: Parameter[] = [];
-    let parametersBody: Parameter | null = null;
+    const result: OperationParameters = {
+        imports: [],
+        parameters: [],
+        parametersPath: [],
+        parametersQuery: [],
+        parametersForm: [],
+        parametersHeader: [],
+        parametersBody: null,
+    };

    // Iterate over the parameters
-    for (let i = 0, n = parametersOrReferences.length; i < n; i++) {
-        const parameterOrReference: OpenApiParameter & OpenApiReference = parametersOrReferences[i];
+    parametersOrReferences.forEach(parameterOrReference => {
        const parameter: OpenApiParameter = getRef<OpenApiParameter>(openApi, parameterOrReference);
        const param: Parameter = getParameter(openApi, parameter);

@ -30,45 +31,42 @@ export function getOperationParameters(openApi: OpenApi, parametersOrReferences:
        if (param.prop !== 'api-version') {
            switch (parameter.in) {
                case 'path':
-                    parametersPath.push(param);
-                    parameters.push(param);
-                    imports.push(...param.imports);
+                    result.parametersPath.push(param);
+                    result.parameters.push(param);
+                    result.imports.push(...param.imports);
                    break;

                case 'query':
-                    parametersQuery.push(param);
-                    parameters.push(param);
-                    imports.push(...param.imports);
+                    result.parametersQuery.push(param);
+                    result.parameters.push(param);
+                    result.imports.push(...param.imports);
                    break;

                case 'header':
-                    parametersHeader.push(param);
-                    parameters.push(param);
-                    imports.push(...param.imports);
+                    result.parametersHeader.push(param);
+                    result.parameters.push(param);
+                    result.imports.push(...param.imports);
                    break;

                case 'formData':
-                    parametersForm.push(param);
-                    parameters.push(param);
-                    imports.push(...param.imports);
+                    result.parametersForm.push(param);
+                    result.parameters.push(param);
+                    result.imports.push(...param.imports);
                    break;

                case 'body':
-                    parametersBody = param;
-                    parameters.push(param);
-                    imports.push(...param.imports);
+                    result.parametersBody = param;
+                    result.parameters.push(param);
+                    result.imports.push(...param.imports);
                    break;
            }
        }
-    }
+    });

-    return {
-        imports,
-        parameters: parameters.sort(sortByRequired),
-        parametersPath: parametersPath.sort(sortByRequired),
-        parametersQuery: parametersQuery.sort(sortByRequired),
-        parametersForm: parametersForm.sort(sortByRequired),
-        parametersHeader: parametersHeader.sort(sortByRequired),
-        parametersBody: parametersBody,
-    };
+    result.parameters = result.parameters.sort(sortByRequired);
+    result.parametersPath = result.parametersPath.sort(sortByRequired);
+    result.parametersQuery = result.parametersQuery.sort(sortByRequired);
+    result.parametersForm = result.parametersForm.sort(sortByRequired);
+    result.parametersHeader = result.parametersHeader.sort(sortByRequired);
+    return result;
 }
--- a/src/openApi/v2/parser/getOperationResponse.ts
+++ b/src/openApi/v2/parser/getOperationResponse.ts
@ -1,31 +1,26 @@
 import { OperationResponse } from '../../../client/interfaces/OperationResponse';

 export function getOperationResponse(responses: OperationResponse[]): OperationResponse {
-    let responseCode = 200;
-    let responseText = '';
-    let responseType = 'any';
-    let responseBase = 'any';
-    let responseTemplate: string | null = null;
-    let responseImports: string[] = [];
+    const response: OperationResponse = {
+        code: 200,
+        text: '',
+        type: 'any',
+        base: 'any',
+        template: null,
+        imports: [],
+    };

    // Fetch the first valid (2XX range) response code and return that type.
    const result: OperationResponse | undefined = responses.find(response => response.code && response.code >= 200 && response.code < 300);

    if (result) {
-        responseCode = result.code;
-        responseText = result.text;
-        responseType = result.type;
-        responseBase = result.base;
-        responseTemplate = result.template;
-        responseImports = [...result.imports];
+        response.code = result.code;
+        response.text = result.text;
+        response.type = result.type;
+        response.base = result.base;
+        response.template = result.template;
+        response.imports.push(...result.imports);
    }

-    return {
-        code: responseCode,
-        text: responseText,
-        type: responseType,
-        base: responseBase,
-        template: responseTemplate,
-        imports: responseImports,
-    };
+    return response;
 }
--- a/src/openApi/v2/parser/getOperationResponses.ts
+++ b/src/openApi/v2/parser/getOperationResponses.ts
@ -12,7 +12,7 @@ import { getSchema } from './getSchema';
 import { OpenApiSchema } from '../interfaces/OpenApiSchema';

 export function getOperationResponses(openApi: OpenApi, responses: OpenApiResponses): OperationResponse[] {
-    const result: OperationResponse[] = [];
+    const results: OperationResponse[] = [];

    // Iterate over each response code and get the
    // status code and response message (if any).
@ -21,43 +21,39 @@ export function getOperationResponses(openApi: OpenApi, responses: OpenApiRespon
            const responseOrReference: OpenApiResponse & OpenApiReference = responses[code];
            const response: OpenApiResponse = getRef<OpenApiResponse>(openApi, responseOrReference);
            const responseCode: number | null = getOperationResponseCode(code);
-            const responseText: string = response.description || '';
-            let responseType = 'any';
-            let responseBase = 'any';
-            let responseTemplate: string | null = null;
-            let responseImports: string[] = [];
-
-            if (response.schema) {
-                if (response.schema.$ref) {
-                    const schemaReference: Type = getType(response.schema.$ref);
-                    responseType = schemaReference.type;
-                    responseBase = schemaReference.base;
-                    responseTemplate = schemaReference.template;
-                    responseImports = [...schemaReference.imports];
-                } else {
-                    const schema: Schema = getSchema(openApi, response.schema as OpenApiSchema);
-                    responseType = schema.type;
-                    responseBase = schema.base;
-                    responseTemplate = schema.template;
-                    responseImports = [...schema.imports];
-                }
-            }
-
            if (responseCode) {
-                result.push({
+                const result: OperationResponse = {
                    code: responseCode,
-                    text: responseText,
-                    type: responseType,
-                    base: responseBase,
-                    template: responseTemplate,
-                    imports: responseImports,
-                });
+                    text: response.description || '',
+                    type: 'any',
+                    base: 'any',
+                    template: null,
+                    imports: [],
+                };
+
+                if (response.schema) {
+                    if (response.schema.$ref) {
+                        const schemaReference: Type = getType(response.schema.$ref);
+                        result.type = schemaReference.type;
+                        result.base = schemaReference.base;
+                        result.template = schemaReference.template;
+                        result.imports.push(...schemaReference.imports);
+                    } else {
+                        const schema: Schema = getSchema(openApi, response.schema as OpenApiSchema);
+                        result.type = schema.type;
+                        result.base = schema.base;
+                        result.template = schema.template;
+                        result.imports.push(...schema.imports);
+                    }
+                }
+
+                results.push(result);
            }
        }
    }

    // Sort the responses to 2XX success codes come before 4XX and 5XX error codes.
-    return result.sort((a, b): number => {
+    return results.sort((a, b): number => {
        return a.code < b.code ? -1 : a.code > b.code ? 1 : 0;
    });
 }
--- a/src/openApi/v2/parser/getParameter.ts
+++ b/src/openApi/v2/parser/getParameter.ts
@ -14,27 +14,36 @@ import { Schema } from '../../../client/interfaces/Schema';
 import { OpenApiSchema } from '../interfaces/OpenApiSchema';

 export function getParameter(openApi: OpenApi, parameter: OpenApiParameter): Parameter {
-    let parameterType = 'any';
-    let parameterBase = 'any';
-    let parameterTemplate: string | null = null;
-    let parameterImports: string[] = [];
+    const result: Parameter = {
+        in: parameter.in,
+        prop: parameter.name,
+        name: getParameterName(parameter.name),
+        type: 'any',
+        base: 'any',
+        template: null,
+        description: getComment(parameter.description),
+        default: parameter.default,
+        required: parameter.required || false,
+        nullable: false,
+        imports: [],
+    };

    // If the parameter has a type than it can be a basic or generic type.
    if (parameter.type) {
        const parameterData: Type = getType(parameter.type);
-        parameterType = parameterData.type;
-        parameterBase = parameterData.base;
-        parameterTemplate = parameterData.template;
-        parameterImports.push(...parameterData.imports);
+        result.type = parameterData.type;
+        result.base = parameterData.base;
+        result.template = parameterData.template;
+        result.imports.push(...parameterData.imports);

        // If the parameter is an Array type, we check for the child type,
        // so we can create a typed array, otherwise this will be a "any[]".
        if (parameter.type === 'array' && parameter.items) {
            const arrayType: ArrayType = getArrayType(parameter.items);
-            parameterType = `${arrayType.type}[]`;
-            parameterBase = arrayType.base;
-            parameterTemplate = arrayType.template;
-            parameterImports.push(...arrayType.imports);
+            result.type = `${arrayType.type}[]`;
+            result.base = arrayType.base;
+            result.template = arrayType.template;
+            result.imports.push(...arrayType.imports);
        }
    }

@ -45,47 +54,35 @@ export function getParameter(openApi: OpenApi, parameter: OpenApiParameter): Par
    if (parameter.schema) {
        if (parameter.schema.$ref) {
            const schemaReference: Type = getType(parameter.schema.$ref);
-            parameterType = schemaReference.type;
-            parameterBase = schemaReference.base;
-            parameterTemplate = schemaReference.template;
-            parameterImports.push(...schemaReference.imports);
+            result.type = schemaReference.type;
+            result.base = schemaReference.base;
+            result.template = schemaReference.template;
+            result.imports.push(...schemaReference.imports);
        } else {
            const schema: Schema = getSchema(openApi, parameter.schema as OpenApiSchema);
-            parameterType = schema.type;
-            parameterBase = schema.base;
-            parameterTemplate = schema.template;
-            parameterImports.push(...schema.imports);
+            result.type = schema.type;
+            result.base = schema.base;
+            result.template = schema.template;
+            result.imports.push(...schema.imports);
        }
    }

    // If the param is a enum then return the values as an inline type.
    if (parameter.enum) {
-        parameterType = getEnumType(parameter.enum);
-        parameterBase = 'string';
-        parameterImports = [];
+        result.type = getEnumType(parameter.enum);
+        result.base = 'string';
+        result.imports = [];
    }

    // Check if this could be a special enum where values are documented in the description.
    if (parameter.description && parameter.type === 'int') {
        const enumType: string | null = getEnumTypeFromDescription(parameter.description);
        if (enumType) {
-            parameterType = enumType;
-            parameterBase = 'number';
-            parameterImports = [];
+            result.type = enumType;
+            result.base = 'number';
+            result.imports = [];
        }
    }

-    return {
-        in: parameter.in,
-        prop: parameter.name,
-        name: getParameterName(parameter.name),
-        type: parameterType,
-        base: parameterBase,
-        template: parameterTemplate,
-        description: getComment(parameter.description),
-        default: parameter.default,
-        required: parameter.required || false,
-        nullable: false,
-        imports: parameterImports,
-    };
+    return result;
 }
--- a/src/openApi/v2/parser/getParameterName.ts
+++ b/src/openApi/v2/parser/getParameterName.ts
@ -5,6 +5,6 @@ import camelCase from 'camelcase';
 * For example: 'filter.someProperty' becomes 'filterSomeProperty'.
 */
 export function getParameterName(value: string): string {
-    const clean = value.replace(/[^\w\s\-]+/g, '_').trim();
+    const clean: string = value.replace(/[^\w\s\-]+/g, '_').trim();
    return camelCase(clean);
 }
--- a/src/openApi/v2/parser/getRef.ts
+++ b/src/openApi/v2/parser/getRef.ts
@ -5,7 +5,7 @@ export function getRef<T>(openApi: OpenApi, item: T & OpenApiReference): T {
    if (item.$ref) {
        // Fetch the paths to the definitions, this converts:
        // "#/definitions/Form" to ["definitions", "Form"]
-        const paths = item.$ref
+        const paths: string[] = item.$ref
            .replace(/^#/g, '')
            .split('/')
            .filter(item => item);
@ -13,14 +13,13 @@ export function getRef<T>(openApi: OpenApi, item: T & OpenApiReference): T {
        // Try to find the reference by walking down the path,
        // if we cannot find it, then we throw an error.
        let result: any = openApi;
-        for (let i = 0, n = paths.length; i < n; i++) {
-            const path: string = paths[i];
+        paths.forEach(path => {
            if (result.hasOwnProperty(path)) {
                result = result[path];
            } else {
                throw new Error(`Could not find reference: "${item.$ref}"`);
            }
-        }
+        });
        return result as T;
    }
    return item as T;
--- a/src/openApi/v2/parser/getSchema.ts
+++ b/src/openApi/v2/parser/getSchema.ts
@ -1,12 +1,130 @@
 import { OpenApi } from '../interfaces/OpenApi';
 import { Schema } from '../../../client/interfaces/Schema';
 import { OpenApiSchema } from '../interfaces/OpenApiSchema';
+import { getType } from './getType';
+import { getComment } from './getComment';
+import { Type } from '../../../client/interfaces/Type';
+import { getEnumType } from './getEnumType';
+import { getEnumTypeFromDescription } from './getEnumTypeFromDescription';
+import { Dictionary } from '../../../utils/types';
+import { OpenApiReference } from '../interfaces/OpenApiReference';
+import { getRef } from './getRef';

-export function getSchema(openApi: OpenApi, schema: OpenApiSchema): Schema {
-    return {
-        type: 'todo',
-        base: 'todo',
+export function getSchema(openApi: OpenApi, schema: OpenApiSchema, required: boolean = false): Schema {
+    /**
+     format?: 'int32' | 'int64' | 'float' | 'double' | 'string' | 'boolean' | 'byte' | 'binary' | 'date' | 'date-time' | 'password';
+     title?: string;
+     description?: string;
+     default?: any;
+     multipleOf?: number;
+     maximum?: number;
+     exclusiveMaximum?: boolean;
+     minimum?: number;
+     exclusiveMinimum?: boolean;
+     maxLength?: number;
+     minLength?: number;
+     pattern?: string;
+     maxItems?: number;
+     minItems?: number;
+     uniqueItems?: number;
+     maxProperties?: number;
+     minProperties?: number;
+     required?: string[];
+     enum?: string[];
+     type?: string;
+     items?: OpenApiSchema & OpenApiReference;
+     allOf?: (OpenApiSchema & OpenApiReference)[];
+     properties?: Dictionary<OpenApiSchema & OpenApiReference>;
+     additionalProperties?: boolean | (OpenApiSchema & OpenApiReference);
+     discriminator?: string;
+     readOnly?: boolean;
+     xml?: OpenApiXml;
+     externalDocs?: OpenApiExternalDocs;
+     example?: any;
+     */
+
+    // TODO: Does this need a name?
+    const result: Schema = {
+        type: 'any',
+        base: 'any',
        template: null,
+        description: getComment(schema.description),
+        default: schema.default,
+        required: required,
+        nullable: false,
+        readOnly: schema.readOnly || false,
+        extends: [],
        imports: [],
+        properties: {},
    };
+
+    // If the schema has a type than it can be a basic or generic type.
+    if (schema.type) {
+        const schemaData: Type = getType(schema.type);
+        result.type = schemaData.type;
+        result.base = schemaData.base;
+        result.template = schemaData.template;
+        result.imports.push(...schemaData.imports);
+
+        // If the schema is an Array type, we check for the child type,
+        // so we can create a typed array, otherwise this will be a "any[]".
+        if (schema.type === 'array' && schema.items) {
+            const itemsOrReference: OpenApiSchema & OpenApiReference = schema.items;
+            const items: OpenApiSchema = getRef<OpenApiSchema>(openApi, itemsOrReference);
+            const itemsSchema: Schema = getSchema(openApi, items);
+            result.type = `${itemsSchema.type}[]`;
+            result.base = itemsSchema.base;
+            result.template = itemsSchema.template;
+            result.imports.push(...itemsSchema.imports);
+        }
+    }
+
+    // If the param is a enum then return the values as an inline type.
+    if (schema.enum) {
+        result.type = getEnumType(schema.enum);
+        result.base = 'string';
+        result.imports = [];
+    }
+
+    // Check if this could be a special enum where values are documented in the description.
+    if (schema.description && schema.type === 'int') {
+        const enumType: string | null = getEnumTypeFromDescription(schema.description);
+        if (enumType) {
+            result.type = enumType;
+            result.base = 'number';
+            result.imports = [];
+        }
+    }
+
+    // Check if this model extends other models
+    if (schema.allOf) {
+        schema.allOf.forEach(parent => {
+            if (parent.$ref) {
+                const extend: Type = getType(parent.$ref);
+                result.extends.push(extend.type);
+                result.imports.push(extend.base);
+            }
+
+            // Merge properties of other models
+            if (parent.properties) {
+                console.log(parent.properties);
+                // const properties: ParsedModelProperties = parseModelProperties(modelClass, definition.allOf[1].properties as SwaggerDefinitions, required);
+                // model.imports.push(...properties.imports);
+                // model.properties.push(...properties.properties);
+                // model.enums.push(...properties.enums);
+            }
+        });
+    }
+
+    const properties: Dictionary<OpenApiSchema & OpenApiReference> | undefined = schema.properties;
+    for (const propertyName in properties) {
+        if (properties.hasOwnProperty(propertyName)) {
+            const property = properties[propertyName];
+            // console.log('property??', property);
+            // console.log('propertyName', propertyName);
+            // getModelProperty(propertyName, property);
+        }
+    }
+
+    return result;
 }
--- a/src/openApi/v2/parser/getServer.ts
+++ b/src/openApi/v2/parser/getServer.ts
@ -5,8 +5,8 @@ import { OpenApi } from '../interfaces/OpenApi';
 * @param openApi
 */
 export function getServer(openApi: OpenApi): string {
-    const scheme = (openApi.schemes && openApi.schemes[0]) || 'http';
-    const host = openApi.host;
-    const basePath = openApi.basePath || '';
+    const scheme: string = (openApi.schemes && openApi.schemes[0]) || 'http';
+    const host: string | undefined = openApi.host;
+    const basePath: string = openApi.basePath || '';
    return host ? `${scheme}://${host}${basePath}` : basePath;
 }
--- a/src/openApi/v2/parser/getServiceClassName.ts
+++ b/src/openApi/v2/parser/getServiceClassName.ts
@ -5,7 +5,7 @@ import camelCase from 'camelcase';
 * the input string to PascalCase and appends the "Service" prefix if needed.
 */
 export function getServiceClassName(value: string): string {
-    const clean = value.replace(/[^\w\s\-]+/g, '_').trim();
+    const clean: string = value.replace(/[^\w\s\-]+/g, '_').trim();
    const name: string = camelCase(clean, { pascalCase: true });
    if (name && !name.endsWith('Service')) {
        return `${name}Service`;
--- a/src/openApi/v2/parser/getType.ts
+++ b/src/openApi/v2/parser/getType.ts
@ -8,10 +8,12 @@ import { getMappedType, hasMappedType } from './getMappedType';
 * @param template Optional template class from parent (needed to process generics)
 */
 export function getType(value: string | undefined, template: string | null = null): Type {
-    let propertyType = 'any';
-    let propertyBase = 'any';
-    let propertyTemplate: string | null = null;
-    let propertyImports: string[] = [];
+    const result: Type = {
+        type: 'any',
+        base: 'any',
+        template: null,
+        imports: [],
+    };

    // Remove definitions prefix and cleanup string.
    const valueClean: string = stripNamespace(value || '');
@ -27,47 +29,42 @@ export function getType(value: string | undefined, template: string | null = nul
            // If the first match is a generic array then construct a correct array type,
            // for example the type "Array[Model]" becomes "Model[]".
            if (match1.type === 'any[]') {
-                propertyType = `${match2.type}[]`;
-                propertyBase = `${match2.type}`;
+                result.type = `${match2.type}[]`;
+                result.base = `${match2.type}`;
                match1.imports = [];
            } else if (match2.type === '') {
                // Primary types like number[] or string[]
-                propertyType = match1.type;
-                propertyBase = match1.type;
-                propertyTemplate = match1.type;
+                result.type = match1.type;
+                result.base = match1.type;
+                result.template = match1.type;
                match2.imports = [];
            } else {
-                propertyType = `${match1.type}<${match2.type}>`;
-                propertyBase = match1.type;
-                propertyTemplate = match2.type;
+                result.type = `${match1.type}<${match2.type}>`;
+                result.base = match1.type;
+                result.template = match2.type;
            }

            // Either way we need to add the found imports
-            propertyImports.push(...match1.imports);
-            propertyImports.push(...match2.imports);
+            result.imports.push(...match1.imports);
+            result.imports.push(...match2.imports);
        }
    } else if (hasMappedType(valueClean)) {
        const mapped: string = getMappedType(valueClean);
-        propertyType = mapped;
-        propertyBase = mapped;
+        result.type = mapped;
+        result.base = mapped;
    } else {
-        propertyType = valueClean;
-        propertyBase = valueClean;
-        propertyImports.push(valueClean);
+        result.type = valueClean;
+        result.base = valueClean;
+        result.imports.push(valueClean);
    }

    // If the property that we found matched the parent template class
    // Then ignore this whole property and return it as a "T" template property.
-    if (propertyType === template) {
-        propertyType = 'T'; // Template;
-        propertyBase = 'T'; // Template;
-        propertyImports = [];
+    if (result.type === template) {
+        result.type = 'T'; // Template;
+        result.base = 'T'; // Template;
+        result.imports = [];
    }

-    return {
-        type: propertyType,
-        base: propertyBase,
-        template: propertyTemplate,
-        imports: propertyImports,
-    };
+    return result;
 }
--- a/src/templates/javascript/core/ApiError.js
+++ b/src/templates/javascript/core/ApiError.js
@ -1,5 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

 import { isSuccess } from "./isSuccess";

--- a/src/templates/javascript/core/OpenAPI.js
+++ b/src/templates/javascript/core/OpenAPI.js
@ -1,5 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

 export let OpenAPI;
 (function (OpenAPI) {
--- a/src/templates/javascript/core/getFormData.js
+++ b/src/templates/javascript/core/getFormData.js
@ -1,5 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

 /**
 * Get FormData from object. This method is needed to upload
--- a/src/templates/javascript/core/getQueryString.js
+++ b/src/templates/javascript/core/getQueryString.js
@ -1,5 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

 /**
 * Get query string from query parameters object. This method also
@ -13,9 +14,9 @@ export function getQueryString(params) {
            const value = params[key];
            if (value !== undefined && value !== null) {
                if (Array.isArray(value)) {
-                    for (let i = 0, n = value.length; i < n; i++) {
-                        qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value[i]))}`);
-                    }
+                    value.forEach(value => {
+                        qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
+                    });
                } else {
                    qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
                }
--- a/src/templates/javascript/core/isSuccess.js
+++ b/src/templates/javascript/core/isSuccess.js
@ -1,5 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

 /**
 * Check success response code.
--- a/src/templates/javascript/core/isValidRequiredParam.js
+++ b/src/templates/javascript/core/isValidRequiredParam.js
@ -1,5 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

 /**
 * Check if a parameter is valid.
--- a/src/templates/javascript/core/request.js
+++ b/src/templates/javascript/core/request.js
@ -1,10 +1,11 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

-import {getFormData} from './getFormData';
-import {getQueryString} from './getQueryString';
-import {OpenAPI} from './OpenAPI';
-import {requestUsingFetch} from './requestUsingFetch';
+import { getFormData } from './getFormData';
+import { getQueryString } from './getQueryString';
+import { OpenAPI } from './OpenAPI';
+import { requestUsingFetch } from './requestUsingFetch';

 /**
 * Create the request.
--- a/src/templates/javascript/core/requestUsingFetch.js
+++ b/src/templates/javascript/core/requestUsingFetch.js
@ -1,5 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

 /**
 * Request content using the new Fetch API. This is the default API that is used and
--- a/src/templates/javascript/core/requestUsingXHR.js
+++ b/src/templates/javascript/core/requestUsingXHR.js
@ -1,8 +1,8 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

-import { Result } from './Result';
-import {isSuccess} from "./isSuccess";
+import { isSuccess } from "./isSuccess";

 /**
 * Request content using the new legacy XMLHttpRequest API. This method is usefull
--- a/src/templates/javascript/index.hbs
+++ b/src/templates/javascript/index.hbs
@ -1,5 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

 export { ApiError } from './core/ApiError';
 export { OpenAPI } from './core/OpenAPI';
--- a/src/templates/javascript/model.hbs
+++ b/src/templates/javascript/model.hbs
@ -1,5 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
+/* prettier-ignore */

 {{#if imports}}
 {{#each imports}}
--- a/src/templates/javascript/service.hbs
+++ b/src/templates/javascript/service.hbs
@ -1,6 +1,6 @@
 /* istanbul ignore file */
 /* eslint-disable */
-import * as yup from 'yup';
+/* prettier-ignore */

 import { ApiError, catchGenericError } from '../core/ApiError';
 import { request } from '../core/request';
--- a/src/templates/typescript/core/ApiError.ts
+++ b/src/templates/typescript/core/ApiError.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 import { isSuccess } from './isSuccess';
 import { Result } from './Result';
--- a/src/templates/typescript/core/Dictionary.ts
+++ b/src/templates/typescript/core/Dictionary.ts
@ -1,3 +1,8 @@
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
 export interface Dictionary<T> {
    [key: string]: T;
 }
--- a/src/templates/typescript/core/OpenAPI.ts
+++ b/src/templates/typescript/core/OpenAPI.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 export namespace OpenAPI {
    export let BASE: string = '';
--- a/src/templates/typescript/core/RequestOptions.ts
+++ b/src/templates/typescript/core/RequestOptions.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 export interface RequestOptions {
    method: string;
--- a/src/templates/typescript/core/Result.ts
+++ b/src/templates/typescript/core/Result.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 export interface Result<T = any> {
    url: string;
--- a/src/templates/typescript/core/getFormData.ts
+++ b/src/templates/typescript/core/getFormData.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 /**
 * Get FormData from object. This method is needed to upload
--- a/src/templates/typescript/core/getQueryString.ts
+++ b/src/templates/typescript/core/getQueryString.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 /**
 * Get query string from query parameters object. This method also
@ -14,9 +15,9 @@ export function getQueryString(params: { [key: string]: any }): string {
            const value: any = params[key];
            if (value !== undefined && value !== null) {
                if (Array.isArray(value)) {
-                    for (let i = 0, n = value.length; i < n; i++) {
-                        qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value[i]))}`);
-                    }
+                    value.forEach(value => {
+                        qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
+                    });
                } else {
                    qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
                }
--- a/src/templates/typescript/core/isSuccess.ts
+++ b/src/templates/typescript/core/isSuccess.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 /**
 * Check success response code.
--- a/src/templates/typescript/core/isValidRequiredParam.ts
+++ b/src/templates/typescript/core/isValidRequiredParam.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 /**
 * Check if a parameter is valid.
--- a/src/templates/typescript/core/request.ts
+++ b/src/templates/typescript/core/request.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 import { getFormData } from './getFormData';
 import { getQueryString } from './getQueryString';
--- a/src/templates/typescript/core/requestUsingFetch.ts
+++ b/src/templates/typescript/core/requestUsingFetch.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 import { Result } from './Result';

--- a/src/templates/typescript/core/requestUsingXHR.ts
+++ b/src/templates/typescript/core/requestUsingXHR.ts
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 import { Result } from './Result';
 import { isSuccess } from './isSuccess';
--- a/src/templates/typescript/index.hbs
+++ b/src/templates/typescript/index.hbs
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 export { ApiError } from './core/ApiError';
 export { isSuccess } from './core/isSuccess';
--- a/src/templates/typescript/model.hbs
+++ b/src/templates/typescript/model.hbs
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 {{#if imports}}
 {{#each imports}}
--- a/src/templates/typescript/service.hbs
+++ b/src/templates/typescript/service.hbs
@ -1,6 +1,7 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
+/* prettier-ignore */

 {{#if imports}}
 {{#each imports}}
--- a/src/utils/getOpenApiSpec.ts
+++ b/src/utils/getOpenApiSpec.ts
@ -25,7 +25,6 @@ function read(filePath: string): string {
 */
 export function getOpenApiSpec(filePath: string): any {
    const content: string = read(filePath);
-
    const extname: string = path.extname(filePath).toLowerCase();
    switch (extname) {
        case '.yml':
--- a/src/utils/getOpenApiVersion.ts
+++ b/src/utils/getOpenApiVersion.ts
@ -9,7 +9,7 @@ export enum OpenApiVersion {
 * an incompatible type. Or if the type is missing...
 * @param openApi The loaded spec (can be any object)
 */
-export function getOpenApiVersion(openApi: any): OpenApiVersion | undefined {
+export function getOpenApiVersion(openApi: any): OpenApiVersion {
    const info: any = openApi.swagger || openApi.openapi;
    if (info && typeof info === 'string') {
        const c: string = info.charAt(0);
--- a/test/mock/v2/test-docs.json
+++ b/test/mock/v2/test-docs.json
--- a/test/mock/v2/test-sites.json
+++ b/test/mock/v2/test-sites.json
@ -1,10 +1,11 @@
 {
    "swagger": "2.0",
    "info": {
-        "version": "V1.0",
-        "title": "CMS"
+        "version": "V9.5",
+        "title": "Sdl.Tridion.ContentManager.OpenApi",
+        "x-swagger-net-version": "8.3.23.103"
    },
-    "host": "global.cms.corp:8080",
+    "host": "dxui-dev.global.sdl.corp:7086",
    "basePath": "/OpenApi",
    "schemes": [
        "http"
@ -2390,7 +2391,7 @@
                    "Blueprinting"
                ],
                "summary": "Localizes an Item in the Blueprint.",
-                "description": "This operation returns an implementation of the abstract type 'RepositoryLocalObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Keyword</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsProcessDefinition</span></li><li><span>VirtualFolder</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'RepositoryLocalObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Keyword</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionProcessDefinition</span></li><li><span>VirtualFolder</span></li></ul>",
                "operationId": "LocalizeRepositoryLocalObject",
                "consumes": [
                    "*/*",
@ -2455,7 +2456,7 @@
                    "Blueprinting"
                ],
                "summary": "UnLocalizes an Item in the Blueprint.",
-                "description": "This operation returns an implementation of the abstract type 'RepositoryLocalObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Keyword</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsProcessDefinition</span></li><li><span>VirtualFolder</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'RepositoryLocalObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Keyword</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionProcessDefinition</span></li><li><span>VirtualFolder</span></li></ul>",
                "operationId": "UnLocalizeRepositoryLocalObject",
                "consumes": [
                    "*/*",
@ -2676,7 +2677,7 @@
                    "Item"
                ],
                "summary": "Fetches an item.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "FetchIdentifableObject",
                "consumes": [
                    "*/*",
@ -2755,7 +2756,7 @@
                    "Item"
                ],
                "summary": "Updates an existing item.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "UpdateIdentifableObject",
                "consumes": [
                    "*/*",
@ -3127,7 +3128,7 @@
                    "Item"
                ],
                "summary": "Returns a default data type for the given Item Type and Container Id.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "GetDefaultData",
                "consumes": [
                    "*/*",
@ -3181,7 +3182,7 @@
                    "Item"
                ],
                "summary": "Copies a RepositoryLocalObject.",
-                "description": "This operation returns an implementation of the abstract type 'RepositoryLocalObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Keyword</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsProcessDefinition</span></li><li><span>VirtualFolder</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'RepositoryLocalObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Keyword</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionProcessDefinition</span></li><li><span>VirtualFolder</span></li></ul>",
                "operationId": "CopyRepositoryLocalObject",
                "consumes": [
                    "*/*",
@ -3251,7 +3252,7 @@
                    "Item"
                ],
                "summary": "Moves a RepositoryLocalObject.",
-                "description": "This operation returns an implementation of the abstract type 'RepositoryLocalObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Keyword</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsProcessDefinition</span></li><li><span>VirtualFolder</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'RepositoryLocalObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Keyword</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionProcessDefinition</span></li><li><span>VirtualFolder</span></li></ul>",
                "operationId": "MoveRepositoryLocalObject",
                "consumes": [
                    "*/*",
@ -3581,7 +3582,7 @@
                    "Lists"
                ],
                "summary": "Gets a list of related items.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "GetList",
                "consumes": [
                    "*/*",
@ -3661,7 +3662,7 @@
                    "OrganizationalItems"
                ],
                "summary": "Gets a list of classified items.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "ClassifiedItems",
                "consumes": [
                    "*/*",
@ -3795,7 +3796,7 @@
                    "OrganizationalItems"
                ],
                "summary": "Gets a list of child items.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "Items",
                "consumes": [
                    "*/*",
@ -3922,7 +3923,7 @@
                    "Blueprinting"
                ],
                "summary": "Gets a list of items that are used by a specific item.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "Uses",
                "consumes": [
                    "*/*",
@ -4119,7 +4120,7 @@
                    "Blueprinting"
                ],
                "summary": "Gets a list of items that use a specific item.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "UsedBy",
                "consumes": [
                    "*/*",
@ -4333,7 +4334,7 @@
                    "OrganizationalItems"
                ],
                "summary": "Gets a list of bundles a specific item is in.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "InBundles",
                "consumes": [
                    "*/*",
@ -4461,7 +4462,7 @@
                    "Workflow"
                ],
                "summary": "Gets a list of Process Definitions for a specific item.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "ProcessDefinitions",
                "consumes": [
                    "*/*",
@ -4529,7 +4530,7 @@
                    "Lists"
                ],
                "summary": "Gets a list of Publications.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "Publications",
                "consumes": [
                    "*/*",
@ -4659,7 +4660,7 @@
                    "Lists"
                ],
                "summary": "Gets the items that are checked out by a given user.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "GetCheckedOutItemsForUser",
                "consumes": [
                    "*/*",
@ -6244,7 +6245,7 @@
                    "Search"
                ],
                "summary": "",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "BasicFullTextSearch",
                "consumes": [
                    "*/*",
@ -6319,7 +6320,7 @@
                    "Search"
                ],
                "summary": "Full search.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "Search",
                "consumes": [
                    "*/*",
@ -6388,7 +6389,7 @@
                "tags": [
                    "Search"
                ],
-                "summary": "Reindexes a Cms repository.",
+                "summary": "Reindexes a Tridion repository.",
                "description": "When no repositoryId is provided, all repositories will be reindexed.",
                "operationId": "Reindex",
                "consumes": [
@ -6485,7 +6486,7 @@
                    "System"
                ],
                "summary": "Gets a system wide list.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "GetSystemWideList",
                "consumes": [
                    "*/*",
@ -6629,14 +6630,14 @@
                }
            }
        },
-        "/api/v{api-version}/cm/system/Cmslanguages": {
+        "/api/v{api-version}/cm/system/tridionlanguages": {
            "get": {
                "tags": [
                    "System"
                ],
                "summary": "Gets available languages.",
                "description": "",
-                "operationId": "GetCmsLanguages",
+                "operationId": "GetTridionLanguages",
                "consumes": [
                    "*/*",
                    "application/json"
@ -6659,10 +6660,10 @@
                        "description": "The request was succesful.",
                        "schema": {
                            "items": {
-                                "$ref": "#/definitions/CmsLanguageInfo"
+                                "$ref": "#/definitions/TridionLanguageInfo"
                            },
                            "xml": {
-                                "name": "CmsLanguageInfo",
+                                "name": "TridionLanguageInfo",
                                "wrapped": true
                            },
                            "type": "array"
@ -6759,7 +6760,7 @@
                        "description": "The filter to apply to the output.",
                        "required": true,
                        "schema": {
-                            "$ref": "#/definitions/CmsDirectoryUsersFilter"
+                            "$ref": "#/definitions/TridionDirectoryUsersFilter"
                        }
                    },
                    {
@ -7558,7 +7559,7 @@
                    "Versioning"
                ],
                "summary": "Gets the history of a VersionedItem.",
-                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>CmsActivityDefinition</span></li><li><span>CmsProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
+                "description": "This operation returns an implementation of the abstract type 'IdentifiableObject'. Depending on the requested item, one of the following instances may be returned:\n\n<ul class=\"model-list\"><li><span>AccessToken</span></li><li><span>ActivityHistory</span></li><li><span>ActivityInstance</span></li><li><span>ApprovalStatus</span></li><li><span>Batch</span></li><li><span>BlueprintNode</span></li><li><span>BundleType</span></li><li><span>BusinessProcessType</span></li><li><span>Category</span></li><li><span>Component</span></li><li><span>ComponentTemplate</span></li><li><span>Folder</span></li><li><span>Group</span></li><li><span>Keyword</span></li><li><span>MultimediaType</span></li><li><span>Page</span></li><li><span>PageTemplate</span></li><li><span>ProcessDefinitionAssociation</span></li><li><span>ProcessHistory</span></li><li><span>ProcessInstance</span></li><li><span>Publication</span></li><li><span>PublishTransaction</span></li><li><span>Repository</span></li><li><span>ResolvedBundle</span></li><li><span>Schema</span></li><li><span>StructureGroup</span></li><li><span>TargetGroup</span></li><li><span>TargetType</span></li><li><span>TemplateBuildingBlock</span></li><li><span>TridionActivityDefinition</span></li><li><span>TridionProcessDefinition</span></li><li><span>User</span></li><li><span>VirtualFolder</span></li><li><span>WorkflowType</span></li><li><span>WorkItem</span></li></ul>",
                "operationId": "History",
                "consumes": [
                    "*/*",
@ -9173,7 +9174,7 @@
                    "type": "array"
                },
                "SynchronizeOptions": {
-                    "$ref": "#/definitions/CmsSynchronizeOptions"
+                    "$ref": "#/definitions/TridionSynchronizeOptions"
                }
            },
            "xml": {
@ -9181,7 +9182,7 @@
            },
            "type": "object"
        },
-        "CmsSynchronizeOptions": {
+        "TridionSynchronizeOptions": {
            "properties": {
                "LoadFlags": {
                    "type": "string",
@ -9222,7 +9223,7 @@
                }
            },
            "xml": {
-                "name": "CmsSynchronizeOptions"
+                "name": "TridionSynchronizeOptions"
            },
            "type": "object"
        },
@ -11668,7 +11669,7 @@
                            },
                            "type": "object"
                        },
-                        "IsCmsWebSchema": {
+                        "IsTridionWebSchema": {
                            "type": "boolean"
                        },
                        "MetadataFields": {
@ -12008,10 +12009,10 @@
            },
            "type": "object"
        },
-        "CmsLanguageInfo": {
+        "TridionLanguageInfo": {
            "properties": {
                "$type": {
-                    "example": "CmsLanguageInfo",
+                    "example": "TridionLanguageInfo",
                    "type": "string"
                },
                "LanguageId": {
@ -12026,7 +12027,7 @@
                }
            },
            "xml": {
-                "name": "CmsLanguageInfo"
+                "name": "TridionLanguageInfo"
            },
            "type": "object"
        },
@ -12060,7 +12061,7 @@
            },
            "type": "object"
        },
-        "CmsDirectoryUsersFilter": {
+        "TridionDirectoryUsersFilter": {
            "properties": {
                "SubtreeDN": {
                    "type": "string"
@ -12077,7 +12078,7 @@
                }
            },
            "xml": {
-                "name": "CmsDirectoryUsersFilter"
+                "name": "TridionDirectoryUsersFilter"
            },
            "type": "object"
        },
@ -15864,7 +15865,7 @@
            },
            "type": "object"
        },
-        "CmsActivityDefinition": {
+        "TridionActivityDefinition": {
            "allOf": [
                {
                    "$ref": "#/definitions/ActivityDefinition"
@ -15919,11 +15920,11 @@
                }
            ],
            "xml": {
-                "name": "CmsActivityDefinition"
+                "name": "TridionActivityDefinition"
            },
            "type": "object"
        },
-        "CmsProcessDefinition": {
+        "TridionProcessDefinition": {
            "allOf": [
                {
                    "$ref": "#/definitions/ProcessDefinition"
@ -15942,7 +15943,7 @@
                }
            ],
            "xml": {
-                "name": "CmsProcessDefinition"
+                "name": "TridionProcessDefinition"
            },
            "type": "object"
        },
@ -16400,7 +16401,7 @@
                        "IsBasedOnMandatorySchema": {
                            "type": "boolean"
                        },
-                        "IsBasedOnCmsWebSchema": {
+                        "IsBasedOnTridionWebSchema": {
                            "type": "boolean"
                        },
                        "Schema": {
--- a/test/mock/v3/test-access.json
+++ b/test/mock/v3/test-access.json
@ -216,12 +216,12 @@
                }
            }
        },
-        "/api/v{api-version}/Applications/getByDisplayName/{name}": {
+        "/api/v{api-version}/Applications/getByName/{name}": {
            "get": {
                "tags": [
                    "Applications"
                ],
-                "operationId": "GetByDisplayName",
+                "operationId": "GetByName",
                "parameters": [
                    {
                        "name": "name",
@ -343,7 +343,7 @@
                            "schema": {
                                "title": "Application",
                                "required": [
-                                    "displayName",
+                                    "name",
                                    "redirectUrls"
                                ],
                                "type": "object",
@ -358,7 +358,7 @@
                                        "format": "int32",
                                        "readOnly": true
                                    },
-                                    "displayName": {
+                                    "name": {
                                        "maxLength": 256,
                                        "type": "string",
                                        "nullable": true
@ -377,7 +377,7 @@
                            "schema": {
                                "title": "Application",
                                "required": [
-                                    "displayName",
+                                    "name",
                                    "redirectUrls"
                                ],
                                "type": "object",
@ -392,7 +392,7 @@
                                        "format": "int32",
                                        "readOnly": true
                                    },
-                                    "displayName": {
+                                    "name": {
                                        "maxLength": 256,
                                        "type": "string",
                                        "nullable": true
@ -411,7 +411,7 @@
                            "schema": {
                                "title": "Application",
                                "required": [
-                                    "displayName",
+                                    "name",
                                    "redirectUrls"
                                ],
                                "type": "object",
@ -426,7 +426,7 @@
                                        "format": "int32",
                                        "readOnly": true
                                    },
-                                    "displayName": {
+                                    "name": {
                                        "maxLength": 256,
                                        "type": "string",
                                        "nullable": true
@ -445,7 +445,7 @@
                            "schema": {
                                "title": "Application",
                                "required": [
-                                    "displayName",
+                                    "name",
                                    "redirectUrls"
                                ],
                                "type": "object",
@ -460,7 +460,7 @@
                                        "format": "int32",
                                        "readOnly": true
                                    },
-                                    "displayName": {
+                                    "name": {
                                        "maxLength": 256,
                                        "type": "string",
                                        "nullable": true
@ -3246,7 +3246,7 @@
        "schemas": {
            "ApiResourceRole": {
                "required": [
-                    "displayName",
+                    "key",
                    "name"
                ],
                "type": "object",
@ -3255,12 +3255,12 @@
                        "type": "integer",
                        "format": "int32"
                    },
-                    "name": {
+                    "key": {
                        "maxLength": 256,
                        "type": "string",
                        "nullable": true
                    },
-                    "displayName": {
+                    "name": {
                        "maxLength": 256,
                        "type": "string",
                        "nullable": true
@ -3273,7 +3273,7 @@
            },
            "ApiResource": {
                "required": [
-                    "displayName",
+                    "key",
                    "name"
                ],
                "type": "object",
@ -3282,13 +3282,13 @@
                        "type": "integer",
                        "format": "int32"
                    },
-                    "name": {
+                    "key": {
                        "maxLength": 256,
                        "pattern": "^[a-zA-Z0-9-_.]*$",
                        "type": "string",
                        "nullable": true
                    },
-                    "displayName": {
+                    "name": {
                        "maxLength": 256,
                        "type": "string",
                        "nullable": true
@ -3366,7 +3366,7 @@
            },
            "Application": {
                "required": [
-                    "displayName",
+                    "name",
                    "redirectUrls"
                ],
                "type": "object",
@ -3380,7 +3380,7 @@
                        "type": "integer",
                        "format": "int32"
                    },
-                    "displayName": {
+                    "name": {
                        "maxLength": 256,
                        "type": "string",
                        "nullable": true
@ -3411,22 +3411,20 @@
            },
            "IdentityProvider": {
                "required": [
-                    "displayName",
-                    "fullNameClaim",
+                    "key",
                    "name",
                    "parameters",
-                    "type",
-                    "usernameClaim"
+                    "type"
                ],
                "type": "object",
                "properties": {
-                    "name": {
+                    "key": {
                        "maxLength": 64,
                        "pattern": "^[a-zA-Z0-9_]*$",
                        "type": "string",
                        "nullable": true
                    },
-                    "displayName": {
+                    "name": {
                        "maxLength": 256,
                        "type": "string",
                        "nullable": true
@ -3442,21 +3440,6 @@
                    "type": {
                        "$ref": "#/components/schemas/IdentityProviderType"
                    },
-                    "separator": {
-                        "maxLength": 1,
-                        "type": "string",
-                        "nullable": true
-                    },
-                    "usernameClaim": {
-                        "maxLength": 256,
-                        "type": "string",
-                        "nullable": true
-                    },
-                    "fullNameClaim": {
-                        "maxLength": 256,
-                        "type": "string",
-                        "nullable": true
-                    },
                    "iconUrl": {
                        "type": "string",
                        "nullable": true
@ -3523,23 +3506,21 @@
                    "identityProvider": {
                        "title": "IdentityProvider",
                        "required": [
-                            "displayName",
-                            "fullNameClaim",
+                            "key",
                            "name",
                            "parameters",
-                            "type",
-                            "usernameClaim"
+                            "type"
                        ],
                        "type": "object",
                        "properties": {
-                            "name": {
+                            "key": {
                                "maxLength": 64,
                                "pattern": "^[a-zA-Z0-9_]*$",
                                "type": "string",
                                "nullable": true,
                                "readOnly": true
                            },
-                            "displayName": {
+                            "name": {
                                "maxLength": 256,
                                "type": "string",
                                "nullable": true,
@ -3567,24 +3548,6 @@
                                "type": "string",
                                "readOnly": true
                            },
-                            "separator": {
-                                "maxLength": 1,
-                                "type": "string",
-                                "nullable": true,
-                                "readOnly": true
-                            },
-                            "usernameClaim": {
-                                "maxLength": 256,
-                                "type": "string",
-                                "nullable": true,
-                                "readOnly": true
-                            },
-                            "fullNameClaim": {
-                                "maxLength": 256,
-                                "type": "string",
-                                "nullable": true,
-                                "readOnly": true
-                            },
                            "iconUrl": {
                                "type": "string",
                                "nullable": true,
@ -3696,7 +3659,7 @@
                        "type": "integer",
                        "format": "int32"
                    },
-                    "displayName": {
+                    "name": {
                        "type": "string",
                        "nullable": true,
                        "readOnly": true
@ -3711,7 +3674,7 @@
                        "type": "integer",
                        "format": "int32"
                    },
-                    "displayName": {
+                    "name": {
                        "type": "string",
                        "nullable": true,
                        "readOnly": true
@ -3726,7 +3689,7 @@
                        "type": "integer",
                        "format": "int32"
                    },
-                    "displayName": {
+                    "name": {
                        "type": "string",
                        "nullable": true,
                        "readOnly": true
@ -3747,23 +3710,21 @@
                    "identityProvider": {
                        "title": "IdentityProvider",
                        "required": [
-                            "displayName",
-                            "fullNameClaim",
+                            "key",
                            "name",
                            "parameters",
-                            "type",
-                            "usernameClaim"
+                            "type"
                        ],
                        "type": "object",
                        "properties": {
-                            "name": {
+                            "key": {
                                "maxLength": 64,
                                "pattern": "^[a-zA-Z0-9_]*$",
                                "type": "string",
                                "nullable": true,
                                "readOnly": true
                            },
-                            "displayName": {
+                            "name": {
                                "maxLength": 256,
                                "type": "string",
                                "nullable": true,
@ -3791,24 +3752,6 @@
                                "type": "string",
                                "readOnly": true
                            },
-                            "separator": {
-                                "maxLength": 1,
-                                "type": "string",
-                                "nullable": true,
-                                "readOnly": true
-                            },
-                            "usernameClaim": {
-                                "maxLength": 256,
-                                "type": "string",
-                                "nullable": true,
-                                "readOnly": true
-                            },
-                            "fullNameClaim": {
-                                "maxLength": 256,
-                                "type": "string",
-                                "nullable": true,
-                                "readOnly": true
-                            },
                            "iconUrl": {
                                "type": "string",
                                "nullable": true,
@ -3927,11 +3870,11 @@
            },
            "LoginOption": {
                "required": [
-                    "displayName"
+                    "name"
                ],
                "type": "object",
                "properties": {
-                    "displayName": {
+                    "name": {
                        "maxLength": 256,
                        "type": "string",
                        "nullable": true