Merge branch 'develop' of https://github.com/blobcity/db into develop

Author: sanketsarang

engine/pom.xml

@@ -146,7 +146,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <!--<version>2.5</version>-->
             <version>2.6</version>
         </dependency>
         <!--<dependency>-->
@@ -274,7 +273,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>1.18</version>
+            <version>[1.20,)</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.tika/tika-parsers -->
@@ -570,6 +575,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                     <groupId>com.google.http-client</groupId>
                     <artifactId>google-http-client</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

engine/src/main/java/com/blobcity/db/code/datainterpreter/InterpreterStoreBean.java

@@ -19,7 +19,6 @@
 import com.blobcity.db.annotations.Interpreter;
 import com.blobcity.db.code.LoaderStore;
 import com.blobcity.db.code.ManifestParserBean;
-import com.blobcity.db.code.RestrictedClassLoader;
 import com.blobcity.db.exceptions.ErrorCode;
 import com.blobcity.db.exceptions.OperationException;
 import com.blobcity.db.sp.interpreter.DataInterpretable;
@@ -29,9 +28,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PostConstruct;
-
-import com.blobcity.db.sp.annotations.Rest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -158,14 +154,13 @@ public void loadClass(final String datastore, final Class clazz) throws Operatio
         for(int i=0; i < annotations.length; i++) {
             Annotation annotation = annotations[i];
             if(annotation.annotationType().equals(Interpreter.class)) {
-                logger.trace("Found the @Interpreter annotation: " + annotation.toString());
                 interpreterAnnotation = annotation;
             }
         }
 
         if(interpreterAnnotation == null) {
-            logger.warn("Cannot process Interpreter class as @Interpreter annotation was missing");
-            throw new OperationException(ErrorCode.CODE_LOAD_ERROR, "Missing @Interpreter annotation on a DataInterpreter implementation");
+            logger.warn("Cannot process Interpreter class as @DataInterpreter annotation was missing");
+            throw new OperationException(ErrorCode.CODE_LOAD_ERROR, "Missing @DataInterpreter annotation on a DataInterpreter implementation");
         }
 
         Interpreter annotation = (Interpreter) interpreterAnnotation;