Continued with jcore:

- Added interface Logical for logical matches ...
- Continued with matches() method in SearchCriteria: Now only single column tests are supported, but more follow!
Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/src/org/mxchange/jcore/criteria/BaseCriteria.java b/src/org/mxchange/jcore/criteria/BaseCriteria.java
index bb3550d8029254b920c0d1737587c132ccf07965..fd81c2e653a58d13a1b2dda210b5ca4d5aaa0f44 100644 (file)
--- a/src/org/mxchange/jcore/criteria/BaseCriteria.java
+++ b/src/org/mxchange/jcore/criteria/BaseCriteria.java
@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import org.mxchange.jcore.BaseFrameworkSystem;
+import org.mxchange.jcore.criteria.logical.Logical;
 
 /**
  * A general criteria class
@@ -32,6 +33,11 @@ public class BaseCriteria extends BaseFrameworkSystem implements Criteria {
         */
        private final Map<String, Object> criteria;
 
+       /**
+        * Logical matcher instance
+        */
+       private Logical logcial;
+
        /**
         * Protected default construtctor
         */
@@ -73,4 +79,20 @@ public class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                return this.criteria.values();
                
        }
+
+       /**
+        * Getter for Logical matcher instance
+        * 
+        * @return Logical matcher instance
+        */
+       protected final Logical getLogical () {
+               return this.logcial;
+       }
+
+       /**
+        * @param logcial the logcial to set
+        */
+       public final void setLogcial (final Logical logcial) {
+               this.logcial = logcial;
+       }
 }

diff --git a/src/org/mxchange/jcore/criteria/logical/Logical.java b/src/org/mxchange/jcore/criteria/logical/Logical.java
new file mode 100644 (file)
index 0000000..2f26db4
--- /dev/null
+++ b/src/org/mxchange/jcore/criteria/logical/Logical.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2015 Roland Haeder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jcore.criteria.logical;
+
+import java.util.Map;
+import java.util.Set;
+import org.mxchange.jcore.FrameworkInterface;
+
+/**
+ * An interface for logical tests
+ *
+ * @author Roland Haeder
+ */
+public interface Logical extends FrameworkInterface {
+
+       /**
+        * Checks logical match condition
+        * 
+        * @param entrySet Entry set where the values are
+        * @param criteraMatches Criteria matches
+        * @return Whether it matches
+        */
+       public boolean matches (final Set<Map.Entry<String, Object>> entrySet, final Map<String, Boolean> criteraMatches);
+}

diff --git a/src/org/mxchange/jcore/criteria/searchable/SearchCriteria.java b/src/org/mxchange/jcore/criteria/searchable/SearchCriteria.java
index fbd8894063278334b5ea238802e0ced8db529791..d9831e55cf38ae26ff5212d8a5780805635cf35a 100644 (file)
--- a/src/org/mxchange/jcore/criteria/searchable/SearchCriteria.java
+++ b/src/org/mxchange/jcore/criteria/searchable/SearchCriteria.java
@@ -16,7 +16,10 @@
  */
 package org.mxchange.jcore.criteria.searchable;
 
+import org.mxchange.jcore.criteria.logical.Logical;
+import java.lang.reflect.InvocationTargetException;
 import java.text.MessageFormat;
+import java.util.HashMap;
 import java.util.Map;
 import org.mxchange.jcore.criteria.BaseCriteria;
 import org.mxchange.jcore.database.storage.Storeable;
@@ -64,7 +67,7 @@ public class SearchCriteria extends BaseCriteria implements SearchableCritera {
        }
 
        @Override
-       public boolean matches (final Storeable storeable) {
+       public boolean matches (final Storeable storeable) throws IllegalArgumentException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
                // Trace message
                this.getLogger().trace(MessageFormat.format("storeable={0} - CALLED!", storeable));
 
@@ -74,13 +77,43 @@ public class SearchCriteria extends BaseCriteria implements SearchableCritera {
                        throw new NullPointerException("storeable is null");
                }
 
-               // Default is matching
-               boolean matches = true;
+               // Init matches array
+               Map<String, Boolean> criteraMatches = new HashMap<>(this.entrySet().size());
 
                // Check all conditions
                for (final Map.Entry<String, Object> criteria : this.entrySet()) {
                        // Debug message
-                       this.getLogger().debug(MessageFormat.format("criteria: key={0},value={1}", criteria.getKey(), criteria.getValue()));
+                       this.getLogger().debug(MessageFormat.format("criteria: key={0},value[{1}]={2}", criteria.getKey(), criteria.getValue().getClass().getSimpleName(), criteria.getValue()));
+
+                       // Get value from column name
+                       Object value = storeable.getValueFromColumn(criteria.getKey());
+
+                       // Debug message
+                       this.getLogger().debug("value[" + value.getClass().getSimpleName() + "]=" + value);
+
+                       // Is both same?
+                       if (value.equals(criteria.getValue())) {
+                               // Debug message
+                               this.getLogger().debug("value=" + value + " - MATCHES!");
+
+                               // Matching criteria found
+                               criteraMatches.put(criteria.getKey(), true);
+                       }
+               }
+
+               // Init matches
+               boolean matches;
+
+               // Is only one entry given?
+               if (this.entrySet().size() == 1) {
+                       // Okay, one criteria only, no need for a "complex" logical match check
+                       matches = (criteraMatches.size() == 1);
+               } else if (this.getLogical() == null) {
+                       // Logical instance is null
+                       throw new NullPointerException("logical is not set, but more than one column shall be matched.");
+               } else {
+                       // Now for the final test
+                       matches = this.getLogical().matches(this.entrySet(), criteraMatches);
                }
 
                // Trace message

diff --git a/src/org/mxchange/jcore/criteria/searchable/SearchableCritera.java b/src/org/mxchange/jcore/criteria/searchable/SearchableCritera.java
index 8455ba519aa160aee8aba380266375a7efa89b73..145d3c92c31d8900ae4241e259a454a3cc44b536 100644 (file)
--- a/src/org/mxchange/jcore/criteria/searchable/SearchableCritera.java
+++ b/src/org/mxchange/jcore/criteria/searchable/SearchableCritera.java
@@ -16,6 +16,7 @@
  */
 package org.mxchange.jcore.criteria.searchable;
 
+import java.lang.reflect.InvocationTargetException;
 import org.mxchange.jcore.criteria.Criteria;
 import org.mxchange.jcore.database.storage.Storeable;
 
@@ -30,8 +31,12 @@ public interface SearchableCritera extends Criteria {
         *
         * @param storeable A Storeable instance to check
         * @return Whether the Storeable instance matches
+        * @throws IllegalArgumentException Some implementations may throw this
+        * @throws java.lang.NoSuchMethodException If the invoked method was not found
+        * @throws java.lang.IllegalAccessException If the method cannot be accessed
+        * @throws java.lang.reflect.InvocationTargetException Any other problems?
         */
-       public boolean matches (final Storeable storeable);
+       public boolean matches (final Storeable storeable) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException;
 
        /**
         * Setter for limit of possible matches