aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java2
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java2
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java2
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java2
-rw-r--r--catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java2
-rw-r--r--catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java2
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/CacheWorker.java2
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java2
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.java2
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java8
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java8
-rw-r--r--test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java2
12 files changed, 18 insertions, 18 deletions
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java
index ebd2e2e108..7df5810a2f 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java
@@ -213,7 +213,7 @@ public class DataMigration {
* corresponding audit event according to the table name
*
* @param map
- * the map from which we will retrive the fields enum values
+ * the map from which we will retrieve the fields enum values
* @param table
* the table we are going to store the record in.
* @return an AuditingGenericEvent event representing the audit record that is going to be
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
index 82f7c32524..e99d65eda0 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
@@ -4560,7 +4560,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
Either<List<CategoryDefinition>, ActionStatus> categories = elementDao
.getAllCategories(NodeTypeEnum.ResourceNewCategory, inTransaction);
if (categories.isRight()) {
- log.debug("failed to retrive resource categories from Titan");
+ log.debug("failed to retrieve resource categories from Titan");
responseFormat = componentsUtils.getResponseFormat(categories.right().value());
componentsUtils.auditResource(responseFormat, user, resource, actionEnum);
throw new ComponentException(categories.right().value());
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
index 65b1f12c03..6c0e0c9fba 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
@@ -1531,7 +1531,7 @@ public class ServiceBusinessLogic extends ComponentBusinessLogic {
log.debug("validating service category {} against valid categories list", list);
Either<List<CategoryDefinition>, ActionStatus> categorys = elementDao.getAllServiceCategories();
if (categorys.isRight()) {
- log.debug("failed to retrive service categories from Titan");
+ log.debug("failed to retrieve service categories from Titan");
ResponseFormat responseFormat = componentsUtils.getResponseFormat(categorys.right().value());
return Either.right(responseFormat);
}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java b/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
index fed36b5653..bfda04e4e7 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
@@ -50,7 +50,7 @@ public class EsGateway extends ProxyServlet {
String esPort = null;
MonitoringBusinessLogic monitoringBL = getMonitoringBL(request.getSession().getServletContext());
if (monitoringBL == null) {
- log.error("failed to retrive monitoringBL.");
+ log.error("failed to retrieve monitoringBL.");
} else {
esHost = monitoringBL.getEsHost();
esPort = monitoringBL.getEsPort();
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java
index a79397b8b2..122543dd0c 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java
@@ -158,7 +158,7 @@ public class FeProxyServlet extends SSLProxyServlet {
private String getModifiedUrl(HttpServletRequest request) throws MalformedURLException {
Configuration config = getConfiguration(request);
if (config == null) {
- log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"FeProxyServlet getModifiedUrl", "sdc-FE", "failed to retrive configuration.");
+ log.error(EcompLoggerErrorCode.UNKNOWN_ERROR,"FeProxyServlet getModifiedUrl", "sdc-FE", "failed to retrieve configuration.");
throw new RuntimeException("failed to read FE configuration");
}
String uri = request.getRequestURI();
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java
index b3bbf4708d..8554927566 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java
@@ -48,7 +48,7 @@ public class KibanaServlet extends ProxyServlet {
public String getModifiedUrl(HttpServletRequest request) {
Configuration config = getConfiguration(request);
if (config == null) {
- log.error("failed to retrive configuration.");
+ log.error("failed to retrieve configuration.");
}
// String scheme = request.getScheme();
String contextPath = request.getContextPath(); // /mywebapp
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/CacheWorker.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/CacheWorker.java
index e70916f170..1db02c4c56 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/CacheWorker.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/CacheWorker.java
@@ -52,7 +52,7 @@ public class CacheWorker implements Runnable, IWorker {
}
/**
- * the method will try to get a job if one is avilable it will be retrived
+ * the method will try to get a job if one is avilable it will be retrieved
* and handled. if no jobs are available the worker will block for 500
* milliseconds and then it wil check if it needs to shutdown. if not it
* will block again and so on until sutdown or a new job is available
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java
index 169f857b2b..7af806f55c 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java
@@ -236,7 +236,7 @@ public class SyncWorker implements Runnable, IWorker {
}
/**
- * the method retrives all nodes matching the given node type from the graph
+ * the method retrieves all nodes matching the given node type from the graph
*
* @param nodeTypeEnum
* node type we want to lookup on the graph
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.java b/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.java
index 1745650c91..4eadd14ab5 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.java
@@ -22,7 +22,7 @@ final class HttpClientConfigImmutable {
private final int numOfRetries;
static HttpClientConfigImmutable getOrCreate(HttpClientConfig httpClientConfig) {
- // TODO: retrive from a pool if exist, otherwise create new
+ // TODO: retrieve from a pool if exist, otherwise create new
return new HttpClientConfigImmutable(httpClientConfig);
}
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java
index 03be183ab7..7b40686271 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java
@@ -330,12 +330,12 @@ public class EntitlementPoolTest {
doReturn(entitlementPool).when(entitlementPoolDao).get(anyObject());
- EntitlementPoolEntity retrived = vendorLicenseManagerImpl.getEntitlementPool(entitlementPool);
+ EntitlementPoolEntity retrieved = vendorLicenseManagerImpl.getEntitlementPool(entitlementPool);
- Assert.assertEquals(retrived.getId(), entitlementPool.getId());
- Assert.assertEquals(retrived.getVendorLicenseModelId(),
+ Assert.assertEquals(retrieved.getId(), entitlementPool.getId());
+ Assert.assertEquals(retrieved.getVendorLicenseModelId(),
entitlementPool.getVendorLicenseModelId());
- Assert.assertEquals(retrived.getVersion(), entitlementPool.getVersion());
+ Assert.assertEquals(retrieved.getVersion(), entitlementPool.getVersion());
}
@Test
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java
index 66f9e97d04..1e547d33ce 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java
@@ -131,8 +131,8 @@ public class ImageManagerImpl implements ImageManager {
}
}
- private void validateHeatVspImageUpdate(String name, String value, String retrivedValue) {
- if (value != null && !value.equals(retrivedValue)) {
+ private void validateHeatVspImageUpdate(String name, String value, String retrievedValue) {
+ if (value != null && !value.equals(retrievedValue)) {
final ErrorCode updateHeatImageErrorBuilder =
ImageErrorBuilder.getImageHeatReadOnlyErrorBuilder(name);
throw new CoreException(updateHeatImageErrorBuilder);
@@ -189,8 +189,8 @@ public class ImageManagerImpl implements ImageManager {
componentId, imageId);
final String data = imageQuestionnaire.getData();
if (data != null) {
- String retrivedFormat = JsonUtil.json2Object(data, ImageDetails.class).getFormat();
- validateHeatVspImageUpdate("format", format, retrivedFormat);
+ String retrievedFormat = JsonUtil.json2Object(data, ImageDetails.class).getFormat();
+ validateHeatVspImageUpdate("format", format, retrievedFormat);
}
}
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java b/test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java
index 2cea226c4b..abfa37b711 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java
@@ -693,7 +693,7 @@ public class AssetLifeCycle extends ComponentBaseTest {
restResponse = ResourceRestUtils.getResourceListFilterByCriteria(ElementFactory.getDefaultUser(UserRoleEnum.DESIGNER), AssetTypeEnum.RESOURCES.getValue(), SearchCriteriaEnum.RESOURCE_TYPE.getValue(), ResourceTypeEnum.VFCMT.toString());
BaseRestUtils.checkSuccess(restResponse);
ResourceAssetStructure dataOutOfSearchResponseForResourceName = ResponseParser.getDataOutOfSearchExternalAPIResponseForResourceName(restResponse.getResponse(), parsedCreatedResponse.getName());
- Assert.assertEquals(parsedCreatedResponse.getUuid(), dataOutOfSearchResponseForResourceName.getUuid(), "Created resourceUUID not equal to search retrive resourceUUID.");
+ Assert.assertEquals(parsedCreatedResponse.getUuid(), dataOutOfSearchResponseForResourceName.getUuid(), "Created resourceUUID not equal to search retrieve resourceUUID.");
// 3. Use getSpecificMetadata external API to receive full information of the VFCMT.
RestResponse assetResponse = AssetRestUtils.getAssetMetadataByAssetTypeAndUuid(true, AssetTypeEnum.RESOURCES, dataOutOfSearchResponseForResourceName.getUuid());