Code reformat

Changed:
* Made some code design changes

Author: ZorTik

core/src/main/java/me/zort/sqllib/mapping/DefaultResultAdapter.java

@@ -14,24 +14,15 @@ public class DefaultResultAdapter implements StatementMappingResultAdapter {
     @Override
     public Object adaptResult(Method method, QueryResult result) {
         Class<?> returnType = method.getReturnType();
-
         if(returnType.equals(QueryResult.class)) {
             return result;
         } else if (isVoid(returnType) || !(result instanceof QueryRowsResult)) {
             return null;
         }
-
         QueryRowsResult<?> rows = (QueryRowsResult<?>) result;
-
-        if (List.class.isAssignableFrom(returnType)) {
-            return rows;
-        }
-
+        if (List.class.isAssignableFrom(returnType)) return rows;
         Object obj = rows.isEmpty() ? null : rows.get(0);
-
-        if (Optional.class.isAssignableFrom(returnType))
-            return Optional.ofNullable(obj);
-
+        if (Optional.class.isAssignableFrom(returnType)) return Optional.ofNullable(obj);
         return obj;
     }
 

core/src/main/java/me/zort/sqllib/mapping/DefaultStatementMapping.java

@@ -40,14 +40,8 @@ public QueryResult executeQuery(StatementMappingOptions options, Method method,
             i++;
         }
 
-        Annotation queryAnnotation = null;
-        QueryAnnotation wrappedAnnotation = null;
-        for (Annotation annotation : method.getAnnotations()) {
-            if (QueryAnnotation.isQueryAnnotation(annotation)) {
-                queryAnnotation = annotation;
-                wrappedAnnotation = QueryAnnotation.wrap(annotation);
-            }
-        }
+        Annotation queryAnnotation = filterQueryAnnotation(method, args);
+        QueryAnnotation wrappedAnnotation = QueryAnnotation.wrap(queryAnnotation);
 
         if (wrappedAnnotation == null) {
             throw new SQLMappingException("No query builder found for method " + method.getName() + "! Is query annotation present?", method, args);
@@ -56,10 +50,8 @@ public QueryResult executeQuery(StatementMappingOptions options, Method method,
         }
 
         QueryNode<?> node = wrappedAnnotation.getQueryBuilder().build(
-                new QueryAnnotation.DefaultMappingDetails(connection, options),
-                queryAnnotation,
-                method,
-                parameters);
+                new QueryAnnotation.DefaultMappingDetails(connection, options), queryAnnotation,
+                method, parameters);
         if (method.isAnnotationPresent(Append.class)) {
             Append append = method.getAnnotation(Append.class);
             node.then(new PlaceholderMapper(parameters).assignValues(append.value()));
@@ -78,6 +70,20 @@ public QueryResult executeQuery(StatementMappingOptions options, Method method,
         }
     }
 
+    private static Annotation filterQueryAnnotation(Method method, Object[] args) {
+        Annotation queryAnnotation = null;
+        for (Annotation annotation : method.getAnnotations()) {
+            boolean isQueryAnnot = QueryAnnotation.isQueryAnnotation(annotation);
+            if (isQueryAnnot && queryAnnotation == null) {
+                queryAnnotation = annotation;
+            } else if (isQueryAnnot) {
+                String errMessage = String.format("Multiple query annotations (Select/Insert/...) found on method %s!", method.getName());
+                throw new SQLMappingException(errMessage, method, args);
+            }
+        }
+        return queryAnnotation;
+    }
+
     @Override
     public boolean isMappingMethod(Method method) {
         for (Annotation annot : method.getAnnotations()) {

core/src/main/java/me/zort/sqllib/mapping/QueryAnnotation.java

@@ -45,8 +45,13 @@ public class QueryAnnotation {
         QUERY_ANNOT.put(Exec.class, new QueryAnnotation(false, new NativeQueryBuilder()));
     }
 
+    public static <T extends Annotation> void register(Class<T> annotation, boolean producesResult, QueryBuilder<T> builder) {
+        QUERY_ANNOT.put(annotation, new QueryAnnotation(producesResult, builder));
+    }
+
     @Nullable
     public static QueryAnnotation wrap(Annotation annotation) {
+        if (annotation == null) return null;
         return isQueryAnnotation(annotation) ? QUERY_ANNOT.get(annotation.annotationType()) : null;
     }