From df9d60218a15ce39f654d2ecbb2d454afd277c79 Mon Sep 17 00:00:00 2001 From: Pasindu Yeshan Date: Sun, 21 Jul 2024 00:16:27 +0530 Subject: [PATCH] Address PR comments --- .../core/protocol/BulkRequestProcessor.java | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/modules/charon-core/src/main/java/org/wso2/charon3/core/protocol/BulkRequestProcessor.java b/modules/charon-core/src/main/java/org/wso2/charon3/core/protocol/BulkRequestProcessor.java index 22ca389a..12d33397 100644 --- a/modules/charon-core/src/main/java/org/wso2/charon3/core/protocol/BulkRequestProcessor.java +++ b/modules/charon-core/src/main/java/org/wso2/charon3/core/protocol/BulkRequestProcessor.java @@ -1,20 +1,20 @@ /* -* Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -* -* WSO2 Inc. licenses this file to you 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. -*/ + * Copyright (c) 2005-2010, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you 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. + */ package org.wso2.charon3.core.protocol; import org.apache.commons.lang.StringUtils; @@ -154,12 +154,9 @@ public BulkResponseData processBulkRequests(BulkRequestData bulkRequestData) thr for (BulkRequestContent bulkRequestContent : bulkRequestData.getUserOperationRequests()) { if (failOnError == 0) { bulkResponseData.addUserOperation(getBulkResponseContent(bulkRequestContent, userResourceManager)); - } else { - if (errors < failOnError) { - bulkResponseData.addUserOperation(getBulkResponseContent(bulkRequestContent, userResourceManager)); - } + } else if (errors < failOnError) { + bulkResponseData.addUserOperation(getBulkResponseContent(bulkRequestContent, userResourceManager)); } - } Map userIdMappings = getUserIdBulkIdMapping(bulkResponseData.getUserOperationResponse());