0.0.2

Author: gustavnavar

.idea/misc.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>me.agno</groupId>
         <artifactId>Grid.Core</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2</version>
     </parent>
 
     <groupId>me.agno.gridcore</groupId>
     <artifactId>gridcore</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
 
     <properties>
         <maven.compiler.source>20</maven.compiler.source>

.idea/vcs.xml

@@ -1,8 +1,7 @@
-package me.agno.gridcore.utils;
+package me.agno.gridcore;
 
-import me.agno.gridcore.SearchOptions;
-import me.agno.gridcore.IGridColumnCollection;
 import me.agno.gridcore.pagination.PagingType;
+import me.agno.gridcore.utils.QueryDictionary;
 
 import java.util.Collection;
 
@@ -14,7 +13,7 @@ public interface IGrid<T> {
 
     IGridColumnCollection getColumns();
 
-    Collection<Object> getItemsToDisplay();
+    Collection<T> getItemsToDisplay();
 
     int getDisplayingItemsCount();
 

gridcore/pom.xml

@@ -1,41 +1,30 @@
 package me.agno.gridcore;
 
 import me.agno.gridcore.columns.IGridColumn;
-import me.agno.gridcore.utils.IGrid;
 
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.function.Function;
 
-public interface IGridColumnCollection<T> extends Collection<IGridColumn<T>>
+public interface IGridColumnCollection<T>
 {
     IGrid<T> getGrid();
 
-    IGridColumn<T> Add(IGridColumn<T> column);
+    IGridColumn<T> add(IGridColumn<T> column);
 
-    IGridColumn<T> Add();
+    IGridColumn<T> add();
 
-    IGridColumn<T> Add(boolean hidden);
+    IGridColumn<T> add(boolean hidden);
 
-    IGridColumn<T> Add(String columnName);
+    IGridColumn<T> add(String columnName);
 
-    IGridColumn<T> Add(boolean hidden, String columnName);
+    IGridColumn<T> add(boolean hidden, String columnName);
 
-    <TKey> IGridColumn<T> Add(Function<T, TKey> expression);
+    <TKey> IGridColumn<T> add(Function<T, TKey> expression, Class targetType);
 
-    <TKey> IGridColumn<T> Add(Function<T, TKey> expression, String columnName);
+    <TKey> IGridColumn<T> add(Function<T, TKey> expression, Class targetType, String columnName);
 
-    <TKey> IGridColumn<T> Add(Function<T, TKey> expression, boolean hidden);
+    <TKey> IGridColumn<T> add(Function<T, TKey> expression, Class targetType, boolean hidden);
 
-    <TKey> IGridColumn<T> Add(Function<T, TKey> expression, Comparator<TKey> comparer);
-
-    <TKey> IGridColumn<T> Add(Function<T, TKey> expression, Comparator<TKey> comparer, String columnName);
-
-    <TKey> IGridColumn<T> Add(Function<T, TKey> expression, Comparator<TKey> comparer,  boolean hidden);
-
-    <TKey> IGridColumn<T> Get(Function<T, TKey> expression);
-
-    IGridColumn<T> Get(String name);
-
-    IGridColumn<T> GetByName(String name);
+    IGridColumn<T> get(String name);
 }

…n/java/me/agno/gridcore/utils/IGrid.java …rc/main/java/me/agno/gridcore/IGrid.javagridcore/src/main/java/me/agno/gridcore/utils/IGrid.java renamed to gridcore/src/main/java/me/agno/gridcore/IGrid.java gridcore/src/main/java/me/agno/gridcore/utils/IGrid.java renamed to gridcore/src/main/java/me/agno/gridcore/IGrid.java

@@ -0,0 +1,12 @@
+package me.agno.gridcore;
+
+import org.jinq.orm.stream.JinqStream;
+
+import java.util.function.Function;
+
+public interface IGridItemsProcessor<T> {
+
+    JinqStream<T> Process(JinqStream<T> items);
+
+    void SetProcess(Function<JinqStream<T>, JinqStream<T>> process);
+}

gridcore/src/main/java/me/agno/gridcore/IGridColumnCollection.java

@@ -0,0 +1,14 @@
+package me.agno.gridcore;
+
+import me.agno.gridcore.filtering.IGridFilterSettings;
+import me.agno.gridcore.searching.IGridSearchSettings;
+import me.agno.gridcore.sorting.IGridSortSettings;
+
+public interface IGridSettingsProvider {
+
+    IGridSortSettings getSortSettings();
+
+    IGridFilterSettings getFilterSettings();
+
+    IGridSearchSettings getSearchSettings();
+}

gridcore/src/main/java/me/agno/gridcore/IGridItemsProcessor.java

@@ -0,0 +1,57 @@
+package me.agno.gridcore;
+
+import me.agno.gridcore.pagination.IGridPager;
+import me.agno.gridcore.sorting.GridSortMode;
+import me.agno.gridcore.totals.TotalsDTO;
+import org.jinq.orm.stream.JinqStream;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Function;
+
+public interface ISGrid<T> extends IGrid<T>, IGridOptions {
+
+        IGridColumnCollection<T> getColumns();
+
+        IGridItemsProcessor<T> getPagerProcessor();
+
+        IGridItemsProcessor<T> getSearchProcessor();
+
+        IGridItemsProcessor<T> getFilterProcessor();
+
+        IGridItemsProcessor<T> getSortProcessor();
+
+        IGridItemsProcessor<T> getTotalsProcessor();
+
+        Collection<T> getItemsToDisplay();
+
+        Collection<T> getItemsToDisplayAsync(Function<JinqStream<T>, List<T>> toList);
+
+        void setToListAsyncFunc(Function<JinqStream<T>, List<T>> toList);
+
+        IGridPager<T> getPager();
+
+        void setPager(IGridPager<T> pager);
+
+        IGridSettingsProvider getSettings();
+
+        TotalsDTO GetTotals();
+
+        boolean isDefaultSortEnabled();
+
+        void setDefaultSortEnabled(boolean defaultFilteringEnabled);
+
+        GridSortMode getGridSortMode();
+
+        void setGridSortMode(GridSortMode gridSortMode);
+
+        boolean isDefaultFilteringEnabled();
+
+        void setDefaultFilteringEnabled(boolean defaultFilteringEnabled);
+
+        void AutoGenerateColumns();
+
+        Collection<T> GetItemsToDisplay();
+
+        int getDisplayingItemsCount();
+}

gridcore/src/main/java/me/agno/gridcore/IGridSettingsProvider.java

@@ -2,17 +2,18 @@
 
 import me.agno.gridcore.sorting.GridSortDirection;
 
-public interface GridColumn {
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
-    GridSortDirection getInitialSortDirection();
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface GridColumn {
 
-    void setInitialSortDirection(GridSortDirection gridSortDirection);
+    public boolean SortEnabled() default false;
 
-    boolean isSortEnabled();
+    public boolean FilterEnabled() default false;
 
-    void setSortEnabled(boolean sortEnabled);
-
-    boolean isFilterEnabled();
-
-    void setFilterEnabled(boolean filterEnabled);
+    public GridSortDirection SortInitialDirection() default GridSortDirection.Ascending;
 }

gridcore/src/main/java/me/agno/gridcore/ISGrid.java

@@ -1,6 +1,16 @@
 package me.agno.gridcore.annotations;
 
-public interface GridMetadataType {
+import lombok.NonNull;
 
-    Class getMetadataType();
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface GridMetadataType {
+
+    @NonNull
+    public Class MetadataType();
 }