minor fixes: correcting log name and max file size, removing duplicat…

…e dependencies, minor code fixes #75
kermitt2 · May 11, 2018 · 028d5a6 · 028d5a6
1 parent 981bef6
commit 028d5a6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -710,17 +710,17 @@
         </dependency>
 
 
-        <dependency>
+<!--        <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
             <version>2.27</version>
             <scope>provided</scope>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <!-- if your container implements Servlet API older than 3.0, use "jersey-container-servlet-core"  -->
-            <artifactId>jersey-container-servlet</artifactId>
+            <artifactId>jersey-container-servlet-core</artifactId>
             <version>2.27</version>
         </dependency>
         <!-- Required only when you are using JAX-RS Client -->

diff --git a/src/main/java/com/scienceminer/nerd/kb/db/WikipediaDomainMap.java b/src/main/java/com/scienceminer/nerd/kb/db/WikipediaDomainMap.java
@@ -237,7 +237,7 @@ private Map<Integer, List<Integer>> readMapping(String mappingFilePath) throws I
                     LOGGER.warn(category + " is not a category found in Wikipedia.");
                 else {
                     categoryId = theCategory.getId();
-                    if (domains.get(new Integer(categoryId)) != null) {
+                    if (domains.get(categoryId) != null) {
                         LOGGER.warn(category + " is already defined in " + mappingFilePath);
                     }
                 }

diff --git a/src/main/java/com/scienceminer/nerd/kb/model/Page.java b/src/main/java/com/scienceminer/nerd/kb/model/Page.java
@@ -1,6 +1,5 @@
 package com.scienceminer.nerd.kb.model;
 
-import com.scienceminer.nerd.exceptions.ResourceNotFound;
 import com.scienceminer.nerd.kb.db.KBLowerEnvironment;
 import com.scienceminer.nerd.kb.model.hadoop.DbPage;
 

diff --git a/src/main/java/com/scienceminer/nerd/service/NerdRestProcessQuery.java b/src/main/java/com/scienceminer/nerd/service/NerdRestProcessQuery.java
@@ -168,7 +168,7 @@ public String processQueryText(NerdQuery nerdQuery) {
 
         long end = System.currentTimeMillis();
         nerdQuery.setRuntime(end - start);
-        System.out.println("runtime: " + (end - start));
+        LOGGER.info("runtime: " + (end - start));
 
         Collections.sort(nerdQuery.getEntities());
         LOGGER.debug(methodLogOut());

diff --git a/src/main/resources/log4j-jetty.xml b/src/main/resources/log4j-jetty.xml
@@ -8,7 +8,8 @@
     </appender>
     <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
         <param name="maxBackupIndex" value="5"/>
-        <param name="File" value="demoApplication.log"/>
+        <param name="maxFileSize" value="50Mb"/>
+        <param name="File" value="nerd.log"/>
         <layout class="org.apache.log4j.PatternLayout">
             <param name="ConversionPattern" value="%d{dd MMM yyyy HH:mm.ss} [%-5p] %-25c{1} - %m\n"/>
         </layout>