Refactoring of MarkupEngines, TemplateEngines and ModelExtractors

.travis.yml

@@ -17,13 +17,13 @@ script:
 - "./gradlew check --stacktrace"
 
 jdk:
-  - openjdk15
+  - openjdk16
   - openjdk11
 
 jobs:
   include:
 
-  - jdk: openjdk15
+  - jdk: openjdk16
     os: osx
 
   - jdk: openjdk11
@@ -42,7 +42,6 @@ jobs:
     - "./gradlew -PskipSigning jacocoRootReport coveralls -i --stacktrace"
 
 notifications:
-  irc: "irc.freenode.org#jbake"
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/2d332fabb02dba68a36b

appveyor.yml

@@ -8,9 +8,8 @@ clone_depth: 10
 environment:
   TERM: dumb
   matrix:
-    - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
     - JAVA_HOME: C:\Program Files\Java\jdk11
-    - JAVA_HOME: C:\Program Files\Java\jdk15
+    - JAVA_HOME: C:\Program Files\Java\jdk16
 
 install:
   - SET PATH=%JAVA_HOME%\bin;%PATH%

build.gradle

@@ -2,12 +2,12 @@ plugins {
     id "eclipse"
     id "idea"
     id "io.sdkman.vendors"                      version "2.0.0"     apply false
-    id "com.github.kt3k.coveralls"              version "2.10.2"    apply false
-    id "org.sonarqube"                          version "3.1.1"     apply false
-    id 'com.github.ben-manes.versions'          version '0.38.0'
-    id "nebula.optional-base"                   version "5.0.3"     apply false
+    id "com.github.kt3k.coveralls"              version "2.12.0"    apply false
+    id "org.sonarqube"                          version "3.2.0"     apply false
+    id 'com.github.ben-manes.versions'          version '0.39.0'
+    id "nebula.optional-base"                   version "6.0.0"     apply false
     id 'org.ajoberstar.grgit'                   version "$grgitVersion"
-    id "io.github.gradle-nexus.publish-plugin"  version "1.0.0"
+    id "io.github.gradle-nexus.publish-plugin"  version "1.1.0"
     id "com.github.breadmoirai.github-release"  version "2.2.12"
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jbake-core/build.gradle

@@ -37,6 +37,7 @@ dependencies {
 processResources {
     from("src/main/resources") {
         include 'default.properties'
+        duplicatesStrategy DuplicatesStrategy.EXCLUDE
         expand jbakeVersion: project.version,
                timestamp: grgit.head().dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'")),
                gitHash: grgit.head().abbreviatedId

jbake-core/src/main/java/org/jbake/app/Asset.java

@@ -62,12 +62,7 @@ public void copy() {
      * @param path The starting path
      */
     public void copy(File path) {
-        FileFilter filter = new FileFilter() {
-            @Override
-            public boolean accept(File file) {
-                return (!config.getAssetIgnoreHidden() || !file.isHidden()) && (file.isFile() || FileUtil.directoryOnlyIfNotIgnored(file, config));
-            }
-        };
+        FileFilter filter = file -> (!config.getAssetIgnoreHidden() || !file.isHidden()) && (file.isFile() || FileUtil.directoryOnlyIfNotIgnored(file, config));
         copy(path, config.getDestinationFolder(), filter);
     }
 
@@ -96,21 +91,20 @@ public void copySingleFile(File asset) {
      * @return true if the path provided points to a file in the asset folder.
      */
     public boolean isAssetFile(File path) {
-        boolean isAsset = false;
-
         try {
-            if(FileUtil.directoryOnlyIfNotIgnored(path.getParentFile(), config)) {
-                if (FileUtil.isFileInDirectory(path, config.getAssetFolder())) {
-                    isAsset = true;
-                } else if (FileUtil.isFileInDirectory(path, config.getContentFolder())
-                    && FileUtil.getNotContentFileFilter(config).accept(path)) {
-                    isAsset = true;
-                }
+            if (FileUtil.directoryOnlyIfNotIgnored(path.getParentFile(), config)
+                && (FileUtil.isFileInDirectory(path, config.getAssetFolder()) || assetsInContentFolder(path))) {
+                return true;
             }
         } catch (IOException ioe) {
             LOGGER.error("Unable to determine the path to asset file {}", path.getPath(), ioe);
         }
-        return isAsset;
+        return false;
+    }
+
+    private boolean assetsInContentFolder(File path) throws IOException {
+        return FileUtil.isFileInDirectory(path, config.getContentFolder())
+            && FileUtil.getNotContentFileFilter(config).accept(path);
     }
 
     /**

jbake-core/src/main/java/org/jbake/app/ContentStore.java

@@ -34,8 +34,6 @@
 import com.orientechnologies.orient.core.metadata.schema.OType;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
-import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
-import org.jbake.launcher.SystemExit;
 import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentTypes;
 import org.jbake.model.ModelAttributes;
@@ -149,8 +147,6 @@ public void close() {
     }
 
     public void shutdown() {
-
-//        Orient.instance().shutdown();
     }
 
     private void startupIfEnginesAreMissing() {
@@ -169,16 +165,14 @@ private void startupIfEnginesAreMissing() {
 
     public void drop() {
         activateOnCurrentThread();
-//        db.drop();
-
         orient.drop(name);
     }
 
     private void activateOnCurrentThread() {
         if (db != null) {
             db.activateOnCurrentThread();
         } else {
-            System.out.println("db is null on activate");
+            logger.warn("db is null on activate");
         }
     }
 

jbake-core/src/main/java/org/jbake/app/Crawler.java

@@ -1,10 +1,11 @@
 package org.jbake.app;
 
-import com.orientechnologies.orient.core.record.impl.ODocument;
 import org.apache.commons.configuration2.CompositeConfiguration;
 import org.apache.commons.io.FilenameUtils;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfigurationFactory;
+import org.jbake.exception.JBakeException;
+import org.jbake.launcher.SystemExit;
 import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentStatus;
 import org.jbake.model.DocumentTypes;
@@ -19,7 +20,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.Map;
 
 /**
  * Crawls a file system looking for content.
@@ -141,9 +141,8 @@ private void crawlDataFiles(File path) {
                     String sha1 = buildHash(sourceFile);
                     String uri = buildDataFileURI(sourceFile);
                     boolean process = true;
-                    DocumentStatus status = DocumentStatus.NEW;
                     String docType = config.getDataFileDocType();
-                    status = findDocumentStatus(uri, sha1);
+                    DocumentStatus status = findDocumentStatus(uri, sha1);
                     if (status == DocumentStatus.UPDATED) {
                         sb.append(" : modified ");
                         db.deleteContent(uri);
@@ -156,8 +155,6 @@ private void crawlDataFiles(File path) {
                     }
                     if (DocumentStatus.NEW == status) {
                         sb.append(" : new ");
-                    }
-                    if (process) { // new or updated
                         crawlDataFile(sourceFile, sha1, uri, docType);
                     }
                     logger.info("{}", sb);
@@ -202,7 +199,7 @@ private String buildDataFileURI(final File sourceFile) {
         String uri = FileUtil.asPath(sourceFile).replace(FileUtil.asPath(config.getDataFolder()), "");
         // strip off leading /
         if (uri.startsWith(FileUtil.URI_SEPARATOR_CHAR)) {
-            uri = uri.substring(1, uri.length());
+            uri = uri.substring(1);
         }
         return uri;
     }
@@ -216,7 +213,7 @@ private String createUri(String uri) {
                 + URLEncoder.encode(FilenameUtils.getBaseName(uri), StandardCharsets.UTF_8.name())
                 + config.getOutputExtension();
         } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("Missing UTF-8 encoding??", e); // Won't happen unless JDK is broken.
+            throw new JBakeException(SystemExit.ERROR, "Missing UTF-8 encoding??", e); // Won't happen unless JDK is broken.
         }
     }
 
@@ -229,7 +226,7 @@ private String createNoExtensionUri(String uri) {
                 + "index"
                 + config.getOutputExtension();
         } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("Missing UTF-8 encoding??", e); // Won't happen unless JDK is broken.
+            throw new JBakeException(SystemExit.ERROR, "Missing UTF-8 encoding??", e); // Won't happen unless JDK is broken.
         }
     }
 
@@ -258,7 +255,7 @@ private void crawlDataFile(final File sourceFile, final String sha1, final Strin
                 logger.warn("{} couldn't be parsed so it has been ignored!", sourceFile);
             }
         } catch (Exception ex) {
-            throw new RuntimeException("Failed crawling file: " + sourceFile.getPath() + " " + ex.getMessage(), ex);
+            throw new JBakeException(SystemExit.ERROR, "Failed crawling file: " + sourceFile.getPath() + " " + ex.getMessage(), ex);
         }
     }
 
@@ -293,8 +290,8 @@ private void addAdditionalDocumentAttributes(DocumentModel document, File source
         document.setCached(true);
 
         if (document.getStatus().equals(ModelAttributes.Status.PUBLISHED_DATE)
-                && (document.getDate() != null)
-                && new Date().after(document.getDate())) {
+            && (document.getDate() != null)
+            && new Date().after(document.getDate())) {
             document.setStatus(ModelAttributes.Status.PUBLISHED);
         }