does not exist(s) typo fixes

Evolveum · Feb 22, 2022 · 6edd80c · 6edd80c
1 parent 971fc30
commit 6edd80c
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 31 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -10137,7 +10137,7 @@
                 <xsd:annotation>
                     <xsd:documentation>
                         This is a "quantum" state: shadow is alive, but not yet alive at the same time. It probably already
-                        exists on the resource (hence exists=true). But it does not exists in the snapshot yet. Gestating shadows
+                        exists on the resource (hence exists=true). But it does not exist in the snapshot yet. Gestating shadows
                         will not appear in resource searches. This should not be a problem for reconciliation, because they
                         should be linked and they will be processed by reconciliation anyway.
                     </xsd:documentation>
@@ -20643,7 +20643,7 @@
                     </xsd:appinfo>
                     <xsd:documentation>
                         The account is not usable. E.g. because the associated shadow does
-                        not exist any more, resource does not exists any more, etc.
+                        not exist anymore, resource does not exist anymore, etc.
                         Such account link will be removed.
                     </xsd:documentation>
                 </xsd:annotation>

diff --git a/infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl b/infra/schema/src/main/resources/xml/ns/public/model/model-3.wsdl
@@ -542,15 +542,15 @@
                 for an object type (e.g. internal repository, resource or both), merging data as necessary,
                 processing any policies, caching mechanisms, etc. This can be influenced by using options.</p>
 
-                <p>Must fail if object with the OID does not exists.</p>
+                <p>Must fail if object with the OID does not exist.</p>
 
                 <p>Reference resolution is SUPPORTED by this operation.</p>
 
                 <p>Faults (TODO):</p>
                 <ul>
                       <li>any SystemFaultType</li>
                       <li>IllegalArgumentFaultType: wrong OID format</li>
-                      <li>ObjectNotFoundFaultType: object with specified OID does not exists</li>
+                      <li>ObjectNotFoundFaultType: object with specified OID does not exist</li>
                 </ul>
             </documentation>
             <input name="getObject" message="tns:getObject"/>
@@ -669,7 +669,7 @@
                 Faults (TODO):
                       any SystemFaultType
                       IllegalArgumentFaultType: wrong OID format
-                      ObjectNotFoundFaultType: object with specified OID does not exists
+                      ObjectNotFoundFaultType: object with specified OID does not exist
             </documentation>
             <input name="findShadowOwner" message="tns:findShadowOwner"/>
             <output name="findShadowOwnerResponse" message="tns:findShadowOwnerResponse"/>

diff --git a/model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java b/model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
@@ -95,7 +95,7 @@ public interface ModelService {
      * processing any policies, caching mechanisms, etc. This can be influenced by using options.
      * </p>
      * <p>
-     * Fails if object with the OID does not exists.
+     * Fails if object with the OID does not exist.
      * </p>
      *
      * @param type

diff --git a/model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java b/model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
@@ -151,7 +151,7 @@ <T extends ObjectType> T resolveReferenceIfExists(ObjectReferenceType reference)
      * processing any policies, caching mechanisms, etc. This can be influenced by using options.
      * </p>
      * <p>
-     * Fails if object with the OID does not exists.
+     * Fails if object with the OID does not exist.
      * </p>
      *
      * @param type
@@ -191,7 +191,7 @@ <T extends ObjectType> T getObject(Class<T> type, String oid, Collection<Selecto
      * processing any policies, caching mechanisms, etc.
      * </p>
      * <p>
-     * Fails if object with the OID does not exists.
+     * Fails if object with the OID does not exist.
      * </p>
      *
      * @param type

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.java
@@ -188,7 +188,7 @@ public <T extends ObjectType> String addObject(PrismObject<T> object, ModelExecu
      * Deletes object with specified OID.
      * </p>
      * <p>
-     * Must fail if object with specified OID does not exists. Should be atomic.
+     * Must fail if object with specified OID does not exist. Should be atomic.
      * </p>
      *
      * @param oid
@@ -249,7 +249,7 @@ public <T extends ObjectType> void deleteObject(Class<T> clazz, String oid, Mode
      * Modifies object using relative change description.
      * </p>
      * <p>
-     * Must fail if user with provided OID does not exists. Must fail if any of
+     * Must fail if user with provided OID does not exist. Must fail if any of
      * the described changes cannot be applied. Should be atomic.
      * </p>
      * <p>

diff --git a/.../main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java b/.../main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
@@ -754,7 +754,7 @@ private <F extends AssignmentHolderType> void finishLegalDecisions(LensContext<F
                         if (projectionContext.isExists()) {
                             LOGGER.trace("Projection {} legal: exists in NONE policy", desc);
                         } else {
-                            LOGGER.trace("Projection {} illegal: does not exists in NONE policy", desc);
+                            LOGGER.trace("Projection {} illegal: does not exist in NONE policy", desc);
                         }
                         // Everything that exists was legal and is legal. Nothing really changes.
                         projectionContext.setLegal(projectionContext.isExists());

diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
@@ -297,7 +297,7 @@ public void test220AssignRoleLandluberToWally() throws Exception {
     }
 
     /**
-     * Create the group directly on resource. Therefore the shadow does NOT exists.
+     * Create the group directly on resource. Therefore the shadow does NOT exist.
      */
     @Test
     public void test222AssignRoleMapmakerToWally() throws Exception {
@@ -1397,9 +1397,9 @@ public void test729CleanupGuybrush() throws Exception {
 
     /**
      * Guybrush is assigned to a group that induces an association to a dummy group that
-     * does not exists yet.
+     * does not exist yet.
      * All the associations to groups that exist should be provisioned. The non-existed group
-     * cannot be provisionined yet. But there should be no error.
+     * cannot be provisioned yet. But there should be no error.
      */
     @Test
     public void test750PrepareGuybrushFuturePerfect() throws Exception {

diff --git a/...sioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java b/...sioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
@@ -71,7 +71,7 @@ public interface ProvisioningService {
     /**
      * Returns object for provided OID.
      *
-     * Must fail if object with the OID does not exists.
+     * Must fail if object with the OID does not exist.
      *
      * Resource Object Shadows: The resource object shadow attributes may be
      * retrieved from the local database, directly form the resource or a
@@ -298,7 +298,7 @@ <T extends ObjectType> SearchResultMetadata searchObjectsIterative(Class<T> type
 
     /**
      * Modifies object using relative change description. Must fail if user with
-     * provided OID does not exists. Must fail if any of the described changes
+     * provided OID does not exist. Must fail if any of the described changes
      * cannot be applied. Should be atomic.
      *
      * If two or more modify operations are executed in parallel, the operations

diff --git a/...ning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/DeleteHelper.java b/...ning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/DeleteHelper.java
@@ -93,7 +93,7 @@ public PrismObject<ShadowType> deleteShadow(PrismObject<ShadowType> repoShadow,
                 result.muteLastSubresultError();
                 shadowManager.deleteShadow(repoShadow, task, result);
                 result.recordHandledError(
-                        "Resource defined in shadow does not exists. Shadow was deleted from the repository.");
+                        "Resource defined in shadow does not exist. Shadow was deleted from the repository.");
                 return null;
             } else {
                 throw ex;

diff --git a/provisioning/provisioning-impl/src/test/resources/opendj/account-bad.xml b/provisioning/provisioning-impl/src/test/resources/opendj/account-bad.xml
@@ -6,12 +6,10 @@
   ~ and European Union Public License. See LICENSE file for details.
   -->
 
-<!--  This account points to an object that does not exists in LDAP -->
+<!--  This account points to an object that does not exist in LDAP -->
 
 <shadow oid="dbb0c37d-9ee6-44a4-8d39-016dbce1ffff"
     xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3"
     xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3">
     <name>drno</name>
     <resourceRef oid="ef2bc95b-76e0-59e2-86d6-3d4f02d3ffff" />

diff --git a/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java b/repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
@@ -176,7 +176,7 @@ public interface RepositoryService {
     /**
      * Returns object version for provided OID.
      * <p>
-     * Must fail if object with the OID does not exists.
+     * Must fail if object with the OID does not exist.
      * <p>
      * This is a supposed to be a very lightweight and cheap operation. It is used to support
      * efficient caching of expensive objects.
@@ -233,9 +233,9 @@ <T extends ObjectType> String getVersion(Class<T> type, String oid, OperationRes
 
     /**
      * <p>Modifies object using relative change description.</p>
-     * Must fail if user with
-     * provided OID does not exists. Must fail if any of the described changes
-     * cannot be applied. Should be atomic.
+     * Must fail if user with provided OID does not exist.
+     * Must fail if any of the described changes cannot be applied.
+     * Should be atomic.
      * </p><p>
      * If two or more modify operations are executed in parallel, the operations
      * should be merged. In case that the operations are in conflict (e.g. one
@@ -320,7 +320,7 @@ interface ModificationsSupplier<T extends ObjectType> {
     /**
      * <p>Deletes object with specified OID.</p>
      * <p>
-     * Must fail if object with specified OID does not exists. Should be atomic.
+     * Must fail if object with specified OID does not exist. Should be atomic.
      * </p>
      *
      * @param oid OID of object to delete

diff --git a/...o-common/src/main/java/com/evolveum/midpoint/repo/common/DirectoryFileObjectResolver.java b/...o-common/src/main/java/com/evolveum/midpoint/repo/common/DirectoryFileObjectResolver.java
@@ -97,9 +97,7 @@ public <T extends ObjectType> T getObject(
                 throw new SystemException(e.getMessage(), e);
             }
         } else {
-            throw new ObjectNotFoundException("Object "+oid+" does not exists");
+            throw new ObjectNotFoundException("Object " + oid + " does not exist");
         }
     }
-
-
 }
diff --git a/...m/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationWorkItemMapping.java b/...m/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationWorkItemMapping.java
@@ -216,7 +216,7 @@ private PrismContainerValue<AccessCertificationCaseType> loadCase(
                 .where(root.ownerOid.eq(ownerOid).and(root.cid.eq(accessCertCaseCid)))
                 .fetchOne();
         if (result == null) {
-            throw new SystemException("Case owner:" + ownerOid + " cid: " + accessCertCaseCid + "does not exists.");
+            throw new SystemException("Case owner:" + ownerOid + " cid:" + accessCertCaseCid + " does not exist.");
         }
         try {
             //noinspection unchecked

diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
@@ -195,7 +195,7 @@ private void loadConfiguration() {
     }
 
     private void extractConfigurationFile(File configFile) {
-        LOGGER.info("Configuration file {} does not exists, the default one will be extracted.", configFile);
+        LOGGER.info("Configuration file {} does not exist, the default one will be extracted.", configFile);
         boolean success = ClassPathUtil.extractFileFromClassPath(this.getConfigFilename(), configFile.getPath());
         if (!success || !configFile.exists()) {
             String message = "Unable to extract configuration file " + this.getConfigFilename() + " from classpath";

diff --git a/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java b/repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
@@ -133,7 +133,7 @@ String addTask(PrismObject<TaskType> taskPrism, RepoAddOptions options, Operatio
 
     /**
      * Modifies task using relative change description. Must fail if object with
-     * provided OID does not exists. Must fail if any of the described changes
+     * provided OID does not exist. Must fail if any of the described changes
      * cannot be applied. Should be atomic.
      *
      * If two or more modify operations are executed in parallel, the operations