versão 1.0.3 finalizada

Author: oJVzinn

.gitignore

@@ -35,4 +35,7 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store
+
+### DOCKER_COMPOSE ###
+mariadb_data/

.idea/misc.xml

@@ -0,0 +1,30 @@
+services:
+  mariadb:
+    image: mariadb:latest
+    container_name: mariadb_db
+    restart: "no"
+    environment:
+      MARIADB_ROOT_PASSWORD: 123456
+      MARIADB_DATABASE: server
+      MARIADB_USER: user
+      MARIADB_PASSWORD: admin
+    ports:
+      - "3306:3306"
+    volumes:
+      - ./mariadb_data:/var/lib/mysql
+
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin:latest
+    container_name: phpmyadmin
+    restart: "no"
+    environment:
+      PMA_HOST: mariadb
+      PMA_USER: root
+      PMA_PASSWORD: 123456
+      UPLOAD_LIMIT: 100M
+    ports:
+      - "9092:80"
+    depends_on:
+      - mariadb
+volumes:
+  mariadb_data:

docker-compose.yml

@@ -56,6 +56,7 @@
     </dependencies>
 
     <build>
+        <finalName>SQLAnnotation</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

pom.xml

@@ -1,6 +1,6 @@
 package com.github.ojvzinn.sqlannotation;
 
-import com.github.ojvzinn.sqlannotation.entity.HikariEntity;
+import com.github.ojvzinn.sqlannotation.model.HikariModel;
 import com.github.ojvzinn.sqlannotation.modules.*;
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.Getter;
@@ -19,7 +19,7 @@ public abstract class SQL {
     private SelectModule selectModule = new SelectModule(this);
     private UpdateModule updateModule = new UpdateModule(this);
 
-    public abstract void init(HikariEntity entity);
+    public abstract void init(HikariModel model);
 
     public abstract void destroy();
 

src/main/java/com/github/ojvzinn/sqlannotation/SQL.java

@@ -1,14 +1,14 @@
 package com.github.ojvzinn.sqlannotation;
 
-import com.github.ojvzinn.sqlannotation.entity.SQLConfigEntity;
+import com.github.ojvzinn.sqlannotation.model.SQLConfigModel;
 import com.github.ojvzinn.sqlannotation.interfaces.Repository;
 import com.github.ojvzinn.sqlannotation.processor.RepositoryProcessor;
 import lombok.Getter;
 
 public class SQLAnnotation {
 
     @Getter
-    private static SQLConfigEntity config;
+    private static SQLConfigModel config;
 
     private static final RepositoryProcessor processor = new RepositoryProcessor();
 
@@ -24,9 +24,9 @@ public static void drop(Class<?> entity) {
         config.getSQLDataBase().getDeleteModule().drop(entity);
     }
 
-    public static void init(SQLConfigEntity entity) {
-        entity.init();
-        config = entity;
+    public static void init(SQLConfigModel model) {
+        model.init();
+        config = model;
     }
 
     public static void destroy() {

src/main/java/com/github/ojvzinn/sqlannotation/SQLAnnotation.java

@@ -0,0 +1,14 @@
+package com.github.ojvzinn.sqlannotation.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Join {
+
+    String column() default "";
+
+}

src/main/java/com/github/ojvzinn/sqlannotation/annotations/Join.java

@@ -0,0 +1,8 @@
+package com.github.ojvzinn.sqlannotation.enums;
+
+public enum OrderType {
+
+    ASC,
+    DESC
+
+}

src/main/java/com/github/ojvzinn/sqlannotation/enums/OrderType.java

@@ -1,17 +1,20 @@
 package com.github.ojvzinn.sqlannotation.interfaces;
 
-import com.github.ojvzinn.sqlannotation.entity.ConditionalEntity;
+import com.github.ojvzinn.sqlannotation.model.ConditionalModel;
+import com.github.ojvzinn.sqlannotation.model.OrderModel;
 import org.json.JSONArray;
 
 public interface Repository<T> {
 
     T findByKey(Object key);
     JSONArray findAll();
-    JSONArray findAllByConditionals(ConditionalEntity conditionals);
+    JSONArray findAll(OrderModel order);
+    JSONArray findAllByConditionals(ConditionalModel conditionals);
+    JSONArray findAllByCondition(ConditionalModel conditionals, OrderModel order);
     void save(T entity);
     void deleteRows();
     void deleteByKey(Object key);
-    void deleteAllByConditionals(ConditionalEntity conditionals);
+    void deleteAllByConditionals(ConditionalModel conditionals);
     void deleteAll();
 
 }

src/main/java/com/github/ojvzinn/sqlannotation/interfaces/Repository.java

@@ -1,11 +1,11 @@
-package com.github.ojvzinn.sqlannotation.entity;
+package com.github.ojvzinn.sqlannotation.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @AllArgsConstructor
 @Getter
-public class ColumnEntity {
+public class ColumnModel {
 
     private String name;
     private String type;