fixed script move/rename issue

Author: dprzybyl

app/aem/core/src/main/java/com/cognifide/apm/core/endpoints/ScriptMoveServlet.java

@@ -83,13 +83,15 @@ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse
           destPath = createUniquePath(destPath, resourceResolver);
           session.move(form.getPath(), destPath);
           session.save();
+          LOGGER.info("Item successfully moved from {} to {}", form.getPath(), destPath);
         }
         if (!containsExtension(form.getPath())) {
           ValueMap valueMap = resourceResolver.getResource(destPath).adaptTo(ModifiableValueMap.class);
+          String prevTitle = valueMap.get(JcrConstants.JCR_TITLE, String.class);
           valueMap.put(JcrConstants.JCR_TITLE, form.getRename());
+          resourceResolver.commit();
+          LOGGER.info("Item successfully renamed from {} to {}", prevTitle, form.getRename());
         }
-        resourceResolver.commit();
-        LOGGER.info("Item successfully moved from {} to {}", form.getPath(), destPath);
         return ResponseEntity.ok("Item successfully moved");
       } catch (Exception e) {
         LOGGER.error("Errors while moving item", e);

app/aem/core/src/main/java/com/cognifide/apm/core/services/ScriptsResourceChangeListener.java

@@ -102,14 +102,17 @@ public void onChange(List<ResourceChange> changes) {
 
     SlingHelper.operateTraced(resolverProvider, resolver -> {
       // rename copy/paste folders
-      changes.stream()
-          .filter(change -> change.getType() == ResourceChange.ChangeType.ADDED)
-          .map(change -> resolver.getResource(change.getPath()))
-          .filter(ScriptsRowModel::isFolder)
-          .forEach(resource -> {
-            ValueMap valueMap = resource.adaptTo(ModifiableValueMap.class);
-            valueMap.put(JcrConstants.JCR_TITLE, resource.getName());
-          });
+      boolean onlyAdded = changes.stream()
+          .allMatch(change -> change.getType() == ResourceChange.ChangeType.ADDED);
+      if (onlyAdded) {
+        changes.stream()
+            .map(change -> resolver.getResource(change.getPath()))
+            .filter(ScriptsRowModel::isFolder)
+            .forEach(resource -> {
+              ValueMap valueMap = resource.adaptTo(ModifiableValueMap.class);
+              valueMap.put(JcrConstants.JCR_TITLE, resource.getName());
+            });
+      }
       //register schedule or cron expression scripts
       changes.stream()
           .filter(change -> StringUtils.endsWith(change.getPath(), Apm.FILE_EXT))