fix a typo 32/83132/2
authorLiang Ding <liang.ding@intel.com>
Mon, 25 Mar 2019 04:40:51 +0000 (21:40 -0700)
committerOfir Sonsino <ofir.sonsino@intl.att.com>
Mon, 25 Mar 2019 10:49:01 +0000 (10:49 +0000)
retrive -- > retrieve

Change-Id: Ic6bce5b991c042cc2d19f1f72dd827644111b105
Issue-ID: SDC-2207
Signed-off-by: Liang Ding <liang.ding@intel.com>
12 files changed:
asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/DataMigration.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceBusinessLogic.java
catalog-be/src/main/java/org/openecomp/sdc/be/monitoring/EsGateway.java
catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/FeProxyServlet.java
catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/KibanaServlet.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/CacheWorker.java
catalog-model/src/main/java/org/openecomp/sdc/be/model/cache/workers/SyncWorker.java
common-app-api/src/main/java/org/openecomp/sdc/common/http/client/api/HttpClientConfigImmutable.java
openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java
openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java
test-apis-ci/src/main/java/org/openecomp/sdc/externalApis/AssetLifeCycle.java

index ebd2e2e..7df5810 100644 (file)
@@ -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
index 82f7c32..e99d65e 100644 (file)
@@ -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());
index 65b1f12..6c0e0c9 100644 (file)
@@ -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);
             }
index fed36b5..bfda04e 100644 (file)
@@ -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();
index a79397b..122543d 100644 (file)
@@ -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();
index b3bbf47..8554927 100644 (file)
@@ -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
index e70916f..1db02c4 100644 (file)
@@ -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
index 169f857..7af806f 100644 (file)
@@ -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
index 1745650..4eadd14 100644 (file)
@@ -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); 
     }
 
index 03be183..7b40686 100644 (file)
@@ -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
index 66f9e97..1e547d3 100644 (file)
@@ -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);
       }
     }
 
index 2cea226..abfa37b 100644 (file)
@@ -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());