From 2f1cf71e142b1c3494bd4f652f3af2a296430b8f Mon Sep 17 00:00:00 2001 From: Michal Kabaj Date: Tue, 26 Nov 2019 12:26:28 +0100 Subject: aaiclient api refactor - removed unused transaction api Issue-ID: DCAEGEN2-1955 Signed-off-by: Michal Kabaj Change-Id: I5ac1ff768b1237370938cf3d9c28c5d610cbcbe4 --- .../sdk/rest/services/aai/client/api/Request.java | 28 --------- .../rest/services/aai/client/api/Transaction.java | 50 ---------------- .../rest/services/aai/client/api/Transactions.java | 52 ----------------- .../services/aai/client/api/TransactionsTest.java | 67 ---------------------- 4 files changed, 197 deletions(-) delete mode 100644 rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Request.java delete mode 100644 rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Transaction.java delete mode 100644 rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Transactions.java delete mode 100644 rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/TransactionsTest.java (limited to 'rest-services') diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Request.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Request.java deleted file mode 100644 index 3c0e55e6..00000000 --- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Request.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * DCAEGEN2-SERVICES-SDK - * ================================================================================ - * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.dcaegen2.services.sdk.rest.services.aai.client.api; - -import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod; - -public interface Request { - HttpMethod method(); - String uri(); -} \ No newline at end of file diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Transaction.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Transaction.java deleted file mode 100644 index a32132bf..00000000 --- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Transaction.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * DCAEGEN2-SERVICES-SDK - * ================================================================================ - * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.dcaegen2.services.sdk.rest.services.aai.client.api; - -import com.google.gson.JsonObject; -import com.google.gson.annotations.SerializedName; -import org.immutables.gson.Gson; -import org.immutables.value.Value; -import org.onap.dcaegen2.services.sdk.rest.services.aai.client.api.Transactions; - -/** - * @see Transactions - */ -@Value.Immutable -@Gson.TypeAdapters(fieldNamingStrategy = true) -public interface Transaction { - - enum Action { - @SerializedName("put") PUT, - @SerializedName("patch") PATCH, - @SerializedName("delete") DELETE - } - - Action action(); - - String uri(); - - @Value.Default - default JsonObject body() { - return new JsonObject(); - } -} \ No newline at end of file diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Transactions.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Transactions.java deleted file mode 100644 index e4058ef7..00000000 --- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/Transactions.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * DCAEGEN2-SERVICES-SDK - * ================================================================================ - * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.dcaegen2.services.sdk.rest.services.aai.client.api; - -import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod.POST; - -import com.google.gson.annotations.SerializedName; -import java.util.List; -import org.immutables.gson.Gson; -import org.immutables.value.Value; -import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod; - -/** - * @see Transaction - * @see AAI - * Bulk API - */ -@Value.Immutable -@Gson.TypeAdapters(fieldNamingStrategy = true) -public interface Transactions extends Request { - - String BULK_SINGLE_TRANSACTION = "/bulk/single-transaction"; - - @SerializedName("operations") - List operations(); - - default HttpMethod method() { - return POST; - } - - default String uri() { - return BULK_SINGLE_TRANSACTION; - } -} \ No newline at end of file diff --git a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/TransactionsTest.java b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/TransactionsTest.java deleted file mode 100644 index de8ca370..00000000 --- a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/api/TransactionsTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * DCAEGEN2-SERVICES-SDK - * ================================================================================ - * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.dcaegen2.services.sdk.rest.services.aai.client.api; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.onap.dcaegen2.services.sdk.rest.services.aai.client.api.Transaction.Action.PUT; - -import com.google.gson.Gson; -import com.google.gson.JsonObject; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.Objects; -import java.util.stream.Collectors; -import org.junit.jupiter.api.Test; - -class TransactionsTest { - - @Test - void shouldBuildTransactionRequest() throws IOException { - // given - JsonObject payload = new JsonObject(); - payload.addProperty("link-name", "foo"); - - ImmutableTransactions transactions = ImmutableTransactions - .builder() - .addOperations(ImmutableTransaction.builder() - .action(PUT) - .uri("/network/logical-links/logical-link/foo") - .body(payload) - .build()) - .build(); - - // when - Gson gson = new Gson().newBuilder().create(); - String transaction = gson.toJson(transactions); - - // then - String expectedJson = getJsonFromFile("transaction.json"); - assertThat(transaction).isEqualToIgnoringWhitespace(expectedJson); - } - - private String getJsonFromFile(String file) throws IOException { - try (BufferedReader br = new BufferedReader(new InputStreamReader( - Objects.requireNonNull(TransactionsTest.class.getClassLoader().getResourceAsStream(file))))) { - return br.lines().collect(Collectors.joining(System.lineSeparator())); - } - } -} \ No newline at end of file -- cgit 1.2.3-korg