Skip to content

Commit

Permalink
Remove deprecated code. (#511)
Browse files Browse the repository at this point in the history 
Remove deprecated code in dataservice-api.

Resolves: OLPEDGE-2772

Signed-off-by: Oleksii Zubko <ext-oleksii.zubko@here.com>

Signed-off-by: Oleksii Zubko <ext-oleksii.zubko@here.com>
  • Loading branch information
@OleksiiZubko
OleksiiZubko committed Sep 6, 2022
1 parent 05f3359 commit e1c4d1e
Show file tree
Hide file tree
Showing 13 changed files with 93 additions and 983 deletions.
36 changes: 8 additions & 28 deletions @here/olp-sdk-dataservice-api/lib/RequestBuilder.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,40 +101,20 @@ export class UrlBuilder {
*/
appendQuery(
key: string,
value?:
| string
| number
| boolean
| string[]
| number[]
| { [key: string]: string | number },
value?: string | number | boolean | string[] | number[],
operator = "="
) {
if (value === undefined) {
return;
}

if (value instanceof Object && !(value instanceof Array)) {
let queryString = "";
for (const propKey in value) {
queryString += UrlBuilder.appendQueryString(
"",
this.hasQuery ? "&" : "?",
propKey,
value[propKey]
);
}

this.url += queryString;
} else {
this.url = UrlBuilder.appendQueryString(
this.url,
this.hasQuery ? "&" : "?",
key,
value,
operator
);
}
this.url = UrlBuilder.appendQueryString(
this.url,
this.hasQuery ? "&" : "?",
key,
value,
operator
);

this.hasQuery = true;
}
Expand Down
114 changes: 11 additions & 103 deletions @here/olp-sdk-dataservice-api/lib/artifact-api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@

import { RequestBuilder, RequestOptions, UrlBuilder } from "./RequestBuilder";

/**
* @deprecated This will be removed by 2.2022. Please use `ArtifactObj` instead.
*/
export interface Artifact {
artifactId: string;
created: Date;
groupId: string;
hrn: string;
updated: Date;
version: string;
}

export interface ArtifactObj {
artifactId: string;
created: string;
Expand All @@ -57,84 +45,33 @@ export interface ArtifactFile {
name?: string;
}

/**
* @deprecated This will be removed by 2.2022. Please use `DeleteArtifactResponseObj` instead.
*/
export interface DeleteArtifactResponse {
artifact?: Artifact;
files?: string[];
}

export interface DeleteArtifactResponseObj {
artifact?: ArtifactObj;
files?: string[];
}

/**
* @deprecated This will be removed by 2.2022. Please use `DeleteFileResponseObj` instead.
*/
export interface DeleteFileResponse {
artifact?: Artifact;
file?: string;
}

export interface DeleteFileResponseObj {
artifact?: ArtifactObj;
file?: string;
}

/**
* @deprecated This will be removed by 2.2022. Please use `DeleteSchemaResponseObj` instead.
*/
export interface DeleteSchemaResponse {
artifacts?: Artifact[];
schema?: Schema;
}

export interface DeleteSchemaResponseObj {
artifacts?: ArtifactObj[];
schema?: Schema;
}

/**
* @deprecated This will be removed by 2.2022. Please use `GetArtifactResponseObj` instead.
*/
export interface GetArtifactResponse {
artifact?: Artifact;
files?: ArtifactFile[];
schema?: SchemaObj;
}

export interface GetArtifactResponseObj {
artifact?: ArtifactObj;
files?: ArtifactFile[];
}

/**
* @deprecated This will be removed by 2.2022. Please use `GetSchemaResponseObj` instead.
*/
export interface GetSchemaResponse {
artifacts?: Artifact[];
schema?: Schema;
schemaValidationResults?: SchemaValidationResults[];
variants?: Variant[];
}

export interface GetSchemaResponseObj {
artifacts?: ArtifactObj[];
schema?: SchemaObj;
schemaValidationResults?: SchemaValidationResults[];
variants?: Variant[];
}

/**
* @deprecated This will be removed by 2.2022. Please use `ListSchemasResponseObj` instead.
*/
export interface ListSchemasResponse {
items?: Schema[];
next?: string;
page?: PagedQuery;
}

export interface ListSchemasResponseObj {
items?: SchemaObj[];
next?: string;
Expand Down Expand Up @@ -166,20 +103,6 @@ export interface RegisterArtifactResponse {
hrnPrefix?: string;
}

/**
* @deprecated This will be removed by 2.2022. Please use `SchemaObj` instead.
*/
export interface Schema {
artifactId: string;
created: Date;
groupId: string;
hrn: string;
name: string;
summary?: string;
updated: Date;
version: string;
}

export interface SchemaObj {
artifactId: string;
created: string;
Expand Down Expand Up @@ -231,7 +154,7 @@ export interface Variant {
export async function deleteArtifactUsingDELETE(
builder: RequestBuilder,
params: { artifactHrn: string }
): Promise<DeleteArtifactResponse | DeleteArtifactResponseObj> {
): Promise<DeleteArtifactResponseObj> {
const baseUrl = "/artifact/{artifactHrn}".replace(
"{artifactHrn}",
UrlBuilder.toString(params["artifactHrn"])
Expand All @@ -245,10 +168,7 @@ export async function deleteArtifactUsingDELETE(
headers
};

return builder.request<DeleteArtifactResponse | DeleteArtifactResponseObj>(
urlBuilder,
options
);
return builder.request<DeleteArtifactResponseObj>(urlBuilder, options);
}

/**
Expand All @@ -261,7 +181,7 @@ export async function deleteArtifactUsingDELETE(
export async function deleteFileUsingDELETE(
builder: RequestBuilder,
params: { artifactHrn: string; fileName: string }
): Promise<DeleteFileResponse | DeleteFileResponseObj> {
): Promise<DeleteFileResponseObj> {
const baseUrl = "/artifact/{artifactHrn}/{fileName}"
.replace("{artifactHrn}", UrlBuilder.toString(params["artifactHrn"]))
.replace("{fileName}", UrlBuilder.toString(params["fileName"]));
Expand All @@ -274,10 +194,7 @@ export async function deleteFileUsingDELETE(
headers
};

return builder.request<DeleteFileResponse | DeleteFileResponseObj>(
urlBuilder,
options
);
return builder.request<DeleteFileResponseObj>(urlBuilder, options);
}

/**
Expand Down Expand Up @@ -409,7 +326,7 @@ export async function registerArtifactUsingPUT(
export async function deleteSchemaUsingDELETE(
builder: RequestBuilder,
params: { schemaHrn: string }
): Promise<DeleteSchemaResponse | DeleteSchemaResponseObj> {
): Promise<DeleteSchemaResponseObj> {
const baseUrl = "/schema/{schemaHrn}".replace(
"{schemaHrn}",
UrlBuilder.toString(params["schemaHrn"])
Expand All @@ -423,10 +340,7 @@ export async function deleteSchemaUsingDELETE(
headers
};

return builder.request<DeleteSchemaResponse | DeleteSchemaResponseObj>(
urlBuilder,
options
);
return builder.request<DeleteSchemaResponseObj>(urlBuilder, options);
}

/**
Expand Down Expand Up @@ -464,7 +378,7 @@ export async function getDocumentUsingGET(
export async function getSchemaUsingGET(
builder: RequestBuilder,
params: { schemaHrn: string }
): Promise<GetSchemaResponse | GetSchemaResponseObj> {
): Promise<GetSchemaResponseObj> {
const baseUrl = "/schema/{schemaHrn}".replace(
"{schemaHrn}",
UrlBuilder.toString(params["schemaHrn"])
Expand All @@ -478,10 +392,7 @@ export async function getSchemaUsingGET(
headers
};

return builder.request<GetSchemaResponse | GetSchemaResponseObj>(
urlBuilder,
options
);
return builder.request<GetSchemaResponseObj>(urlBuilder, options);
}

/**
Expand All @@ -501,7 +412,7 @@ export async function listUsingGET(
from?: string;
limit?: number;
}
): Promise<ListSchemasResponse | ListSchemasResponseObj> {
): Promise<ListSchemasResponseObj> {
const baseUrl = "/schema";

const urlBuilder = new UrlBuilder(builder.baseUrl + baseUrl);
Expand All @@ -516,10 +427,7 @@ export async function listUsingGET(
headers
};

return builder.request<ListSchemasResponse | ListSchemasResponseObj>(
urlBuilder,
options
);
return builder.request<ListSchemasResponseObj>(urlBuilder, options);
}

/**
Expand Down
43 changes: 2 additions & 41 deletions @here/olp-sdk-dataservice-api/lib/blob.v2.api.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,30 +52,6 @@ export interface DataHandleResponse {
handle: string;
}

/**
* Object or common prefix stored in Object Store layer.
* @deprecated This will be removed by 2.2022. Please use `KeysListObjectItemResponseObj` instead.
*/
export interface KeysListObjectItemResponse {
/**
* Name of the object/common prefix.
*/
name: string;
/**
* Object size in bytes or omitted if the `type` field is `commonPrefix`.
*/
size?: number;
/**
* Last modified date and time in RFC 3339 format or omitted if the `type` field is `commonPrefix`.
*/
lastModified?: Date;
/**
* Indicates whether the item is object or common prefix.
* Can be "object" or "commonPrefix";
*/
type: string;
}

/**
* Object or common prefix stored in Object Store layer.
*/
Expand All @@ -99,18 +75,6 @@ export interface KeysListObjectItemResponseObj {
type: string;
}

/**
* Paginated response of keys and common prefixes.
* @deprecated This will be removed by 2.2022. Please use `KeysListResponseObj` instead.
*/
export interface KeysListResponse {
/**
* Page token to fetch the next page.
*/
pageToken: string;
items: KeysListObjectItemResponse[];
}

/**
* Paginated response of keys and common prefixes.
*/
Expand Down Expand Up @@ -474,7 +438,7 @@ export async function listKeys(
limit?: number;
deep?: "true" | "false";
}
): Promise<KeysListResponse | KeysListResponseObj> {
): Promise<KeysListResponseObj> {
const baseUrl = "/layers/{layerId}/keys".replace(
"{layerId}",
UrlBuilder.toString(params["layerId"])
Expand All @@ -492,10 +456,7 @@ export async function listKeys(
headers
};

return builder.request<KeysListResponse | KeysListResponseObj>(
urlBuilder,
options
);
return builder.request<KeysListResponseObj>(urlBuilder, options);
}

/**
Expand Down
Loading

0 comments on commit e1c4d1e

Please sign in to comment.