small paging improvements

src/main/java/com/jh/boot/jpa/AbstractHibernateRepository.java

@@ -149,7 +149,7 @@ public abstract class AbstractHibernateRepository {
 		
 		sortedCriteria(c, pagingInfo);
 		
-		return new Page<>(pagingInfo.getPage(), pagingInfo.getPageSize(), pagesCount, count, c.list(), pagingInfo.getField(), pagingInfo.getTrend());
+		return new Page<>(pagingInfo.getPage(), pagesCount, pagingInfo.getPageSize(), count, c.list(), pagingInfo.getField(), pagingInfo.getTrend());
 	}
 
 	

src/main/java/com/jh/boot/web/list/DefaultSorting.java

-/*
- * Created on 25. 8. 2017 18:29:24
- *
- */
-package com.jh.boot.web.list;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The Interface DefaultSorting.
- *
- * @author Jan Hrabal
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.PARAMETER})
-public @interface DefaultSorting {
-
-	/**
-	 * Field.
-	 *
-	 * @return the string
-	 */
-	String field();
-	
-	/**
-	 * Trend.
-	 *
-	 * @return the sort trend
-	 */
-	SortTrend trend() default SortTrend.ASCENDING;
-	
-}
+/*
+ * Created on 25. 8. 2017 18:29:24
+ *
+ */
+package com.jh.boot.web.list;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The Interface DefaultSorting.
+ *
+ * @author Jan Hrabal
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.PARAMETER})
+public @interface DefaultSorting {
+
+	/**
+	 * Field.
+	 *
+	 * @return the string
+	 */
+	String field();
+	
+	/**
+	 * Trend.
+	 *
+	 * @return the sort trend
+	 */
+	SortTrend trend() default SortTrend.ASCENDING;
+	
+}

src/main/java/com/jh/boot/web/list/ListHelper.java

@@ -94,12 +94,12 @@ public class ListHelper {
 			field = defaultField;
 		}
 
-		if (trend == null) {
+		if (!StringUtils.hasText(trend)) {
 			if (defaultTrend != null) {
 				st = defaultTrend;
 			}
 		} else {
-			st = "desc".equalsIgnoreCase(trend) ? SortTrend.DESCENDING : SortTrend.ASCENDING;
+			st = SortTrend.parse(trend);
 		}
 
 		if (!StringUtils.hasText(field) || st == null) {

src/main/java/com/jh/boot/web/list/Page.java

@@ -128,8 +128,8 @@ public class Page<T> {
      *
      * @return the trend
      */
-    public SortTrend getTrend() {
-        return trend;
+    public String getTrend() {
+        return trend == null ? null : trend.getTrend();
     }
 
     /**

src/main/java/com/jh/boot/web/list/SortTrend.java

-/*
- * Created on 30. 10. 2016 7:32:25
- *
- */
-package com.jh.boot.web.list;
-
-/**
- * The Enum SortTrend.
- *
- * @author Jan Hrabal
- */
-public enum SortTrend {
-    
-    /** The ascending. */
-    ASCENDING, 
- /** The descending. */
- DESCENDING
-}
+/*
+ * Created on 30. 10. 2016 7:32:25
+ *
+ */
+package com.jh.boot.web.list;
+
+/**
+ * The Enum SortTrend.
+ *
+ * @author Jan Hrabal
+ */
+public enum SortTrend {
+
+	/** The ascending. */
+	ASCENDING("asc"),
+	/** The descending. */
+	DESCENDING("desc");
+
+	private String trend;
+
+	private SortTrend(String trend) {
+		this.trend = trend;
+	}
+
+	public String getTrend() {
+		return trend;
+	}
+
+	@Override
+	public String toString() {
+		return trend;
+	}
+	
+	
+	public static SortTrend parse(String s) {
+		for (SortTrend st : values()) {
+			if (st.trend.equalsIgnoreCase(s) || st.name().equalsIgnoreCase(s)) {
+				return st;
+			}
+		}
+		return null;
+	}
+	
+	
+}