[MediaWiki-commits] [Gerrit] Small changes to fix some stuff breaking during test on server. - change (mediawiki...WikidataEntitySuggester)
Nilesh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/85957
Change subject: Small changes to fix some stuff breaking during test on server.
..
Small changes to fix some stuff breaking during test on server.
Change-Id: Ibe20e20107c8b7b872bd24c49283f81459aea234
---
M client/pom.xml
M
client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
M
client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
M client/src/main/webapp/META-INF/context.xml
M myrrix-claimprops/pom.xml
A myrrix-claimprops/src/main/webapp/META-INF/context.xml
M myrrix-claimprops/src/main/webapp/WEB-INF/web.xml
M myrrix-refprops/pom.xml
A myrrix-refprops/src/main/webapp/META-INF/context.xml
M myrrix-refprops/src/main/webapp/WEB-INF/web.xml
10 files changed, 24 insertions(+), 56 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikidataEntitySuggester
refs/changes/57/85957/1
diff --git a/client/pom.xml b/client/pom.xml
index a785365..b056a0a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -19,6 +19,7 @@
endorsed.dir${project.build.directory}/endorsed/endorsed.dir
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
powermock.version1.5.1/powermock.version
+netbeans.hint.deploy.serverTomcat/netbeans.hint.deploy.server
/properties
dependencies
diff --git
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
index 3bfaa83..2c81817 100644
---
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
+++
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
@@ -89,14 +89,14 @@
float countSum = 0, count = 0;
if (keyFound.apply(temp) == true) {
-key = temp;
-temp = reader.readLine();
+key = temp.trim();
+temp = reader.readLine().trim();
}
while (keyFound.apply(temp) == false) {
-String strings[] = temp.split(,);
+String strings[] = temp.trim().split(,);
String item = strings[0].trim();
-count = Integer.parseInt(strings[1].trim());
+count = Integer.parseInt(strings[1]);
countSum += count;
list.add(new TranslatedRecommendedItemImpl(item, count));
temp = reader.readLine();
diff --git
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
index c771856..999260e 100644
---
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
+++
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
@@ -7,8 +7,6 @@
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
-import javax.servlet.UnavailableException;
-import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.mahout.cf.taste.common.TasteException;
@@ -41,10 +39,7 @@
public void init() throws ServletException {
Recommender recommender = getRecommender();
if (recommender == null) {
-WebServlet webServlet =
this.getClass().getAnnotation(WebServlet.class);
-String ingestAction = /entitysuggester +
webServlet.urlPatterns();
-throw new UnavailableException(Please initialize the
recommendation engine by using + ingestAction
-+ before making any requests to this suggester servlet);
+throw new ServletException(Please initialize the recommendation
engine by using the ingest servlet before making any requests to this suggester
servlet);
}
}
@@ -67,7 +62,7 @@
inputList = INPUT_SEPARATOR.splitToList(pathInfo.substring(1));
}
int howMany = getHowMany(request);
-
+
try {
String jsonSuggestions =
getRecommender().recommendAsJSON(inputList, howMany);
response.getWriter().write(jsonSuggestions);
@@ -85,9 +80,9 @@
try {
howMany = Integer.parseInt(request.getParameter(howMany));
} catch (NumberFormatException nfe) {
-return 0;
+howMany = 0;
}
-
[MediaWiki-commits] [Gerrit] Small changes to fix some stuff breaking during test on server. - change (mediawiki...WikidataEntitySuggester)
Daniel Kinzler has submitted this change and it was merged.
Change subject: Small changes to fix some stuff breaking during test on server.
..
Small changes to fix some stuff breaking during test on server.
Change-Id: Ibe20e20107c8b7b872bd24c49283f81459aea234
---
M client/pom.xml
M
client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
M
client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
M client/src/main/webapp/META-INF/context.xml
M myrrix-claimprops/pom.xml
A myrrix-claimprops/src/main/webapp/META-INF/context.xml
M myrrix-claimprops/src/main/webapp/WEB-INF/web.xml
M myrrix-refprops/pom.xml
A myrrix-refprops/src/main/webapp/META-INF/context.xml
M myrrix-refprops/src/main/webapp/WEB-INF/web.xml
10 files changed, 24 insertions(+), 56 deletions(-)
Approvals:
Daniel Kinzler: Verified; Looks good to me, approved
diff --git a/client/pom.xml b/client/pom.xml
index a785365..b056a0a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -19,6 +19,7 @@
endorsed.dir${project.build.directory}/endorsed/endorsed.dir
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
powermock.version1.5.1/powermock.version
+netbeans.hint.deploy.serverTomcat/netbeans.hint.deploy.server
/properties
dependencies
diff --git
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
index 3bfaa83..2c81817 100644
---
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
+++
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
@@ -89,14 +89,14 @@
float countSum = 0, count = 0;
if (keyFound.apply(temp) == true) {
-key = temp;
-temp = reader.readLine();
+key = temp.trim();
+temp = reader.readLine().trim();
}
while (keyFound.apply(temp) == false) {
-String strings[] = temp.split(,);
+String strings[] = temp.trim().split(,);
String item = strings[0].trim();
-count = Integer.parseInt(strings[1].trim());
+count = Integer.parseInt(strings[1]);
countSum += count;
list.add(new TranslatedRecommendedItemImpl(item, count));
temp = reader.readLine();
diff --git
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
index c771856..999260e 100644
---
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
+++
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
@@ -7,8 +7,6 @@
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
-import javax.servlet.UnavailableException;
-import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.mahout.cf.taste.common.TasteException;
@@ -41,10 +39,7 @@
public void init() throws ServletException {
Recommender recommender = getRecommender();
if (recommender == null) {
-WebServlet webServlet =
this.getClass().getAnnotation(WebServlet.class);
-String ingestAction = /entitysuggester +
webServlet.urlPatterns();
-throw new UnavailableException(Please initialize the
recommendation engine by using + ingestAction
-+ before making any requests to this suggester servlet);
+throw new ServletException(Please initialize the recommendation
engine by using the ingest servlet before making any requests to this suggester
servlet);
}
}
@@ -67,7 +62,7 @@
inputList = INPUT_SEPARATOR.splitToList(pathInfo.substring(1));
}
int howMany = getHowMany(request);
-
+
try {
String jsonSuggestions =
getRecommender().recommendAsJSON(inputList, howMany);
response.getWriter().write(jsonSuggestions);
@@ -85,9 +80,9 @@
try {
howMany = Integer.parseInt(request.getParameter(howMany));
} catch (NumberFormatException nfe) {
-return 0;
+howMany = 0;
}
-Preconditions.checkArgument(howMany 0, howMany must be positive);
+
