Sergey Shepelevich pushed to branch master at cms-community / 
hippo-services-webfiles


Commits:
74fa247c by Sergey Shepelevich at 2018-03-06T14:07:54+01:00
CMS-11100 API Cleanup

- - - - -


1 changed file:

- src/main/java/org/onehippo/cms7/services/webfiles/WebFilesServiceImpl.java


Changes:

=====================================
src/main/java/org/onehippo/cms7/services/webfiles/WebFilesServiceImpl.java
=====================================
--- a/src/main/java/org/onehippo/cms7/services/webfiles/WebFilesServiceImpl.java
+++ b/src/main/java/org/onehippo/cms7/services/webfiles/WebFilesServiceImpl.java
@@ -109,9 +109,9 @@ public class WebFilesServiceImpl implements WebFilesService 
{
     }
 
     @Override
-    public void importJcrWebFileBundle(final Session session, final File 
directory, boolean bootstrapPhase) throws IOException, WebFileException {
+    public void importJcrWebFileBundle(final Session session, final File 
directory, boolean skipIfAlreadyAutoLoaded) throws IOException, 
WebFileException {
         final AutoReloadService autoReload = 
HippoServiceRegistry.getService(AutoReloadService.class);
-        if (bootstrapPhase && autoReload != null && autoReload.isEnabled()) {
+        if (skipIfAlreadyAutoLoaded && autoReload != null && 
autoReload.isEnabled()) {
             // (re)import files will be done directly from file system. In 
case of an existing local repository, existing
             // web files will be replaced completely to sync possible local 
changes after restart
             log.debug("Auto reload is enabled hence webfiles are (re-)imported 
directly from filesystem instead of from configuration module.");
@@ -122,9 +122,9 @@ public class WebFilesServiceImpl implements WebFilesService 
{
     }
 
     @Override
-    public void importJcrWebFileBundle(final Session session, final ZipFile 
zip, boolean bootstrapPhase) throws IOException, WebFileException {
+    public void importJcrWebFileBundle(final Session session, final ZipFile 
zip, boolean skipIfAlreadyAutoLoaded) throws IOException, WebFileException {
         final AutoReloadService autoReload = 
HippoServiceRegistry.getService(AutoReloadService.class);
-        if (bootstrapPhase && autoReload != null && autoReload.isEnabled()) {
+        if (skipIfAlreadyAutoLoaded && autoReload != null && 
autoReload.isEnabled()) {
             // (re)import files will be done directly from file system. In 
case of an existing local repository, existing
             // web files will be replaced completely to sync possible local 
changes after restart
            log.debug("Auto reload is enabled hence webfiles are (re-)imported 
directly from filesystem instead of from configuration module.");
@@ -134,13 +134,6 @@ public class WebFilesServiceImpl implements 
WebFilesService {
         }
     }
 
-    @Override
-    public void importJcrWebFileBundle(final Session session, final ZipFile 
zip) throws IOException, WebFileException {
-        final WebFilesZipArchive archive = new WebFilesZipArchive(zip, 
importedFiles, maxFileLengthBytes);
-        importJcrWebFileBundle(session, archive);
-    }
-
-
     private void importJcrWebFileBundle(final Session session, final 
AbstractWebFilesArchive archive) throws IOException, WebFileException{
         WebFileBundleArchive bundleArchive = new WebFileBundleArchive(archive);
         String bundleName = null;



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-services-webfiles/commit/74fa247c82e1960e38586d7074faae6103023a29

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-services-webfiles/commit/74fa247c82e1960e38586d7074faae6103023a29
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

Reply via email to