Skip to content

Commit

Permalink
more code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ancho
ancho committed Aug 4, 2018
1 parent b013d2c commit 9a0727a
Show file tree
Hide file tree
Showing 17 changed files with 617 additions and 656 deletions.
121 changes: 59 additions & 62 deletions jbake-core/src/main/java/org/jbake/app/Crawler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,57 +25,19 @@
*/
public class Crawler {

public static final String URI_SEPARATOR_CHAR = "/";

public abstract static class Attributes {

private Attributes() {
}

/**
* Possible values of the {@link Attributes#STATUS} property
*
* @author ndx
*/
public abstract static class Status {
private Status() {
}

public static final String PUBLISHED_DATE = "published-date";
public static final String PUBLISHED = "published";
public static final String DRAFT = "draft";
}

public static final String DATE = "date";
public static final String STATUS = "status";
public static final String TYPE = "type";
public static final String TITLE = "title";
public static final String URI = "uri";
public static final String FILE = "file";
public static final String TAGS = "tags";
public static final String TAG = "tag";
public static final String ROOTPATH = "rootpath";
public static final String ID = "id";
public static final String NO_EXTENSION_URI = "noExtensionUri";
public static final String ALLTAGS = "alltags";
public static final String PUBLISHED_DATE = "published_date";
public static final String BODY = "body";
public static final String DB = "db";
}

private static final Logger LOGGER = LoggerFactory.getLogger(Crawler.class);

public static final String URI_SEPARATOR_CHAR = "/";
private final ContentStore db;
private JBakeConfiguration config;
private Parser parser;
private final ContentStore db;

/**
* @param db Database instance for content
* @param source Base directory where content directory is located
* @param config Project configuration
* @deprecated Use {@link #Crawler(ContentStore, JBakeConfiguration)} instead.
*
* <p>
* Creates new instance of Crawler.
* @param db Database instance for content
* @param source Base directory where content directory is located
* @param config Project configuration
*/
@Deprecated
public Crawler(ContentStore db, File source, CompositeConfiguration config) {
Expand All @@ -86,8 +48,9 @@ public Crawler(ContentStore db, File source, CompositeConfiguration config) {

/**
* Creates new instance of Crawler.
* @param db Database instance for content
* @param config Project configuration
*
* @param db Database instance for content
* @param config Project configuration
*/
public Crawler(ContentStore db, JBakeConfiguration config) {
this.db = db;
Expand Down Expand Up @@ -169,7 +132,7 @@ private String buildURI(final File sourceFile) {
String uri = FileUtil.asPath(sourceFile).replace(FileUtil.asPath(config.getContentFolder()), "");

// On windows we have to replace the backslash
if ( ! File.separator.equals(URI_SEPARATOR_CHAR) ) {
if (!File.separator.equals(URI_SEPARATOR_CHAR)) {
uri = uri.replace(File.separator, URI_SEPARATOR_CHAR);
}

Expand Down Expand Up @@ -236,7 +199,7 @@ private void crawlSourceFile(final File sourceFile, final String sha1, final Str
}

if (config.getUriWithoutExtension()) {
fileContents.put(Attributes.NO_EXTENSION_URI, uri.replace("/index.html", "/"));
fileContents.put(Attributes.NO_EXTENSION_URI, uri.replace("/index.html", "/"));
}


Expand All @@ -254,21 +217,21 @@ private void crawlSourceFile(final File sourceFile, final String sha1, final Str
}

public String getPathToRoot(File sourceFile) {
File rootPath = config.getContentFolder();
File parentPath = sourceFile.getParentFile();
int parentCount = 0;
while (!parentPath.equals(rootPath)) {
parentPath = parentPath.getParentFile();
parentCount++;
}
StringBuilder sb = new StringBuilder();
for (int i = 0; i < parentCount; i++) {
sb.append("../");
}
if (config.getUriWithoutExtension()) {
sb.append("../");
File rootPath = config.getContentFolder();
File parentPath = sourceFile.getParentFile();
int parentCount = 0;
while (!parentPath.equals(rootPath)) {
parentPath = parentPath.getParentFile();
parentCount++;
}
StringBuilder sb = new StringBuilder();
for (int i = 0; i < parentCount; i++) {
sb.append("../");
}
return sb.toString();
if (config.getUriWithoutExtension()) {
sb.append("../");
}
return sb.toString();
}

private DocumentStatus findDocumentStatus(String docType, String uri, String sha1) {
Expand All @@ -285,4 +248,38 @@ private DocumentStatus findDocumentStatus(String docType, String uri, String sha
return DocumentStatus.NEW;
}
}

public abstract static class Attributes {

public static final String DATE = "date";
public static final String STATUS = "status";
public static final String TYPE = "type";
public static final String TITLE = "title";
public static final String URI = "uri";
public static final String FILE = "file";
public static final String TAGS = "tags";
public static final String TAG = "tag";
public static final String ROOTPATH = "rootpath";
public static final String ID = "id";
public static final String NO_EXTENSION_URI = "noExtensionUri";
public static final String ALLTAGS = "alltags";
public static final String PUBLISHED_DATE = "published_date";
public static final String BODY = "body";
public static final String DB = "db";
private Attributes() {
}

/**
* Possible values of the {@link Attributes#STATUS} property
*
* @author ndx
*/
public abstract static class Status {
public static final String PUBLISHED_DATE = "published-date";
public static final String PUBLISHED = "published";
public static final String DRAFT = "draft";
private Status() {
}
}
}
}
10 changes: 6 additions & 4 deletions jbake-core/src/main/java/org/jbake/app/Oven.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@
*/
public class Oven {

private final static Logger LOGGER = LoggerFactory.getLogger(Oven.class);
private static final Logger LOGGER = LoggerFactory.getLogger(Oven.class);

private Utensils utensils;
private List<Throwable> errors = new LinkedList<Throwable>();
private List<Throwable> errors = new LinkedList<>();
private int renderedCount = 0;

/**
* @deprecated Use {@link #Oven(JBakeConfiguration)} instead
* Delegate c'tor to prevent API break for the moment.
*
* @param source Project source directory
Expand All @@ -43,6 +44,7 @@ public Oven(final File source, final File destination, final boolean isClearCach
}

/**
* @deprecated Use {@link #Oven(JBakeConfiguration)} instead
* Creates a new instance of the Oven with references to the source and destination folders.
*
* @param source Project source directory
Expand Down Expand Up @@ -144,7 +146,7 @@ public void bake() {
LOGGER.info("Baking finished!");
long end = new Date().getTime();
LOGGER.info("Baked {} items in {}ms", renderedCount, end - start);
if (errors.size() > 0) {
if (!errors.isEmpty()) {
LOGGER.error("Failed to bake {} item(s)!", errors.size());
}
} finally {
Expand Down Expand Up @@ -193,7 +195,7 @@ private void renderContent() {


public List<Throwable> getErrors() {
return new ArrayList<Throwable>(errors);
return new ArrayList<>(errors);
}

public Utensils getUtensils() {
Expand Down
Loading

0 comments on commit 9a0727a

Please sign in to comment.