Fixed some hot reloading and SQL issues

README.md

@@ -1,5 +1,5 @@
 # Lucy
-A simple HTTP framework based on Netty for Java.
+A micro HTTP framework based on Netty for Java.
 
 ## Requirements
 - JDK8+
@@ -159,12 +159,13 @@ Method | Function
 ## Method Annotations
 Annotation | Function
 ------------ | -------------
-`@Api` | Marks method as an API method
-`@Api("text/plain")` | Marks method as API and sets Content-Type
+`@Api` | Marks method as an API method and ignores templating
+`@Api("text/plain")` | Marks method as API and sets Content-Type and ignores templating
 `@NoSession` | Does not bother with session stuff
 `@Status(200)` | Sets HTTP response code
 `@View("index1")` | Sets custom view
 `@View("")` | Removes templating
+`@NoAccess` | Does not check `hasAccess()` which returns boolean, for e.x: isLoggedIn
 
 ## Examples
 Say you have an API with buyer and seller. You can have the code separately like this:

src/main/java/com/pring/lucy/server/Handler.java

@@ -67,7 +67,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
     if (cause instanceof HaltException)
       Http.sendException(ctx, HttpResponseStatus.valueOf(((HaltException) cause).status), cause.getMessage());
     else {
-      if (Server.developmentMode) {
+      if (true || Server.developmentMode) {
         if (StringUtils.contains(cause.getMessage(), "cannot find symbol")) {
           String ex[] = cause.getMessage().split("\n");
 

src/main/java/com/pring/lucy/server/HotReload.java

@@ -171,20 +171,23 @@ class Reloader extends ClassLoader {
     @SuppressWarnings("unchecked")
     @Override
     public Class<? extends HttpController> findClass(String path) {
-      byte[] bytes;
-      try {
-        bytes = loadClassData(path);
-
-        return 
-            (Class<? extends HttpController>) 
+      Class ret = null;
+
+      do {
+        byte[] bytes;
+        try {
+          bytes = loadClassData(path);
+
+          ret = (Class<? extends HttpController>) 
               defineClass(
                   path.split("/../")[1].replace('/', '.').replace(".class", ""),
                   bytes, 0, bytes.length);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
+        } catch (Exception e) {
+          e.printStackTrace();
+        }
+      } while(ret == null);
 
-      return null;
+      return ret;
     }
 
     private byte[] loadClassData(String classPath) throws IOException {
@@ -203,6 +206,7 @@ private byte[] loadClassData(String classPath) throws IOException {
           e.printStackTrace();
         }
       }
+
       return null;
     }
   }

src/main/java/com/pring/lucy/server/HttpController.java

@@ -17,6 +17,7 @@
 import java.util.TreeSet;
 
 import com.pring.lucy.annotations.Api;
+import com.pring.lucy.annotations.NoAccess;
 import com.pring.lucy.annotations.NoSession;
 import com.pring.lucy.annotations.Status;
 import com.pring.lucy.annotations.View;
@@ -166,16 +167,20 @@ else if (t.getTypeName().equals("double"))
         idx++;
       }
 
-      _method.invoke(this, parameters);
-
+      if (_method.getAnnotation(NoAccess.class) == null && hasAccess())
+        _method.invoke(this, parameters);
+      else if (_method.getAnnotation(NoAccess.class) != null)
+        _method.invoke(this, parameters);
+      else
+        halt = new HaltException("No access", 401);
+
       if (halt != null) {
         throw halt;
       }
 
-      if (_method.getAnnotation(Api.class) != null)
+      if (_method.getAnnotation(Api.class) != null) {
         response.headers().set(HeaderNames.CONTENT_TYPE, _method.getAnnotation(Api.class).value());
-
-      if (template.length() > 0) {
+      } else if (template.length() > 0) {
         String[] elems = pkg.split("\\.");
         elems[elems.length - 1] = template;
 
@@ -343,6 +348,10 @@ private List<String> formParams(String key, boolean number) {
     return l;
   }
 
+  public List<String> formParams(String key) {
+    return formParams(key, false);
+  }
+
   public String POST(String key) {
     return formParams(key, false).get(0);
   }
@@ -426,7 +435,11 @@ public Map<String, File> files() {
   }
 
   public void sendFile(String filePath) throws Exception {
-    StaticFileHandler.sendFile(ctx, filePath, request, true);
+    StaticFileHandler.sendFile(ctx, filePath, request, true, null);
+  }
+
+  public void sendFile(String filePath, String fileName) throws Exception {
+    StaticFileHandler.sendFile(ctx, filePath, request, true, fileName);
   }
 
   public void sendFile(byte[] data, String fileName) throws Exception {
@@ -466,5 +479,9 @@ public void redirectWithTemplate(String to, String template) {
     redirect(to);
   }
 
+  public boolean hasAccess() {
+    return true;
+  }
+
   public abstract void index() throws Exception;
 }

src/main/java/com/pring/lucy/server/Server.java

@@ -100,7 +100,7 @@ public Server upload(String location, boolean yes) {
     return this;
   }
 
-  public Server database(String cs, String u, String p) {
+  public Server database(String cs, String u, String p, String... driver) {
     config = new HikariConfig();
 
     config.setJdbcUrl(cs);
@@ -114,7 +114,10 @@ public Server database(String cs, String u, String p) {
 
     config.setInitializationFailFast(true);
     config.setIdleTimeout(10000);
-    config.setMaximumPoolSize(10);
+    config.setMaximumPoolSize(2);
+
+    if (driver.length > 0)
+      config.setDriverClassName(driver[0]);
 
     database = true;
 

src/main/java/com/pring/lucy/server/SqlDB.java

@@ -7,6 +7,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -67,14 +68,49 @@ public static CachedRowSet query(String query, Object... args) {
       resultSet = statement.executeQuery();
 
       result.populate(resultSet);
+    } catch (SQLException e) {
+      if (e.getMessage().contains("crashed")) {
+        String tokens[] = e.getMessage().split("\\s+");
+        System.out.println(e.getMessage() + ". Trying to auto-repair.");
+
+        Connection tempCon = null;
+        PreparedStatement tempStmt = null;
+        try {
+          tempCon = getConnection();
+          tempStmt = tempCon.prepareStatement("REPAIR TABLE " 
+              + tokens[1].replaceAll("\\'", "`") + ";");
+          tempStmt.executeQuery();
+        } catch (Exception ex) {
+          ex.printStackTrace();
+        } finally {
+          try {
+            tempStmt.close();
+            tempCon.close();
+          } catch (Exception ex) {
+            ex.printStackTrace();
+          }
+        }
+
+        return query(query, args);
+      }
     } catch (Exception e) {
       e.printStackTrace();
     } finally {
       try {
         resultSet.close();
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+
+      try {
         statement.close();
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+
+      try {
         connection.close();
-      } catch (SQLException e) {
+      } catch (Exception e) {
         e.printStackTrace();
       }
     }
@@ -169,6 +205,7 @@ private ResultSetIterator(String query, Object[] args) {
         setArgs(statement, args);
         resultSet = statement.executeQuery();
       } catch (Exception e) {
+        close();
         e.printStackTrace();
       }
 
@@ -219,6 +256,10 @@ public void close() {
         connection.close();
       } catch (SQLException e) {
         e.printStackTrace();
+      } finally {
+        try {
+          connection.close();
+        } catch (Exception e) { }
       }
     }
   }

src/main/java/com/pring/lucy/server/StaticFileHandler.java

@@ -62,11 +62,11 @@ protected void channelRead0(ChannelHandlerContext ctx, FullHttpRequest request)
       return;
     }
 
-    sendFile(ctx, Server.staticFileLocation + Http.sanitizeFileUri(request.getUri()), request, false);
+    sendFile(ctx, Server.staticFileLocation + Http.sanitizeFileUri(request.getUri()), request, false, null);
   }
 
   protected static void sendFile(ChannelHandlerContext ctx, String path,
-      FullHttpRequest request, boolean transfer) throws Exception {
+      FullHttpRequest request, boolean transfer, String sendName) throws Exception {
     File file = new File(path);
 
     if (file.isHidden() || file.exists() || file.isFile()) {
@@ -101,7 +101,7 @@ protected static void sendFile(ChannelHandlerContext ctx, String path,
       if (transfer) {
         response.headers().add("Content-Description", "File Transfer");
         response.headers().add(HeaderNames.CONTENT_TYPE, "application/octet-stream");
-        response.headers().add("Content-Disposition", "attachment; filename=" + path);
+        response.headers().add("Content-Disposition", "attachment; filename=" + sendName != null ? sendName : path);
         response.headers().add(HeaderNames.CONTENT_TRANSFER_ENCODING, "binary");
       }