You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2014/05/06 18:27:22 UTC
svn commit: r1592799 - in /tika/trunk/tika-server/src:
main/java/org/apache/tika/server/TikaWelcome.java
test/java/org/apache/tika/server/TikaVersionTest.java
test/java/org/apache/tika/server/TikaWelcomeTest.java
Author: nick
Date: Tue May 6 16:27:21 2014
New Revision: 1592799
URL: http://svn.apache.org/r1592799
Log:
TIKA-1269 Sort welcome output, and add test coverage of it
Modified:
tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaWelcome.java
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaVersionTest.java
tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaWelcomeTest.java
Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaWelcome.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaWelcome.java?rev=1592799&r1=1592798&r2=1592799&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaWelcome.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaWelcome.java Tue May 6 16:27:21 2014
@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -105,6 +106,16 @@ public class TikaWelcome {
}
}
}
+ Collections.sort(found, new Comparator<Endpoint>() {
+ @Override
+ public int compare(Endpoint e1, Endpoint e2) {
+ int res = e1.path.compareTo(e2.path);
+ if (res == 0) {
+ res = e1.methodName.compareTo(e2.methodName);
+ }
+ return res;
+ }
+ });
return found;
}
@@ -154,11 +165,11 @@ public class TikaWelcome {
text.append("\n");
text.append("For endpoints, please see ");
text.append(DOCS_URL);
- text.append("\n");
+ text.append("\n\n");
for (Endpoint e : identifyEndpoints()) {
text.append(e.httpMethod);
- text.append(" @ ");
+ text.append(" ");
text.append(e.path);
text.append("\n");
for (String produces : e.produces) {
Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaVersionTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaVersionTest.java?rev=1592799&r1=1592798&r2=1592799&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaVersionTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaVersionTest.java Tue May 6 16:27:21 2014
@@ -30,7 +30,7 @@ import org.apache.tika.Tika;
import org.junit.Test;
public class TikaVersionTest extends CXFTestBase {
- private static final String VERSION_PATH = "/version";
+ protected static final String VERSION_PATH = "/version";
@Override
protected void setUpResources(JAXRSServerFactoryBean sf) {
Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaWelcomeTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaWelcomeTest.java?rev=1592799&r1=1592798&r2=1592799&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaWelcomeTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/TikaWelcomeTest.java Tue May 6 16:27:21 2014
@@ -28,14 +28,19 @@ import org.apache.tika.Tika;
import org.junit.Test;
public class TikaWelcomeTest extends CXFTestBase {
- private static final String WELCOME_PATH = "/";
+ protected static final String WELCOME_PATH = "/";
+ private static final String VERSION_PATH = TikaVersionTest.VERSION_PATH;
@Override
protected void setUpResources(JAXRSServerFactoryBean sf) {
- sf.setResourceClasses(TikaWelcome.class);
+ sf.setResourceClasses(TikaWelcome.class, TikaVersion.class);
sf.setResourceProvider(
TikaWelcome.class,
- new SingletonResourceProvider(new TikaWelcome(tika, sf))
+ new SingletonResourceProvider(new TikaWelcome(tika, sf))
+ );
+ sf.setResourceProvider(
+ TikaVersion.class,
+ new SingletonResourceProvider(new TikaVersion(tika))
);
}
@@ -54,6 +59,15 @@ public class TikaWelcomeTest extends CXF
assertContains(new Tika().toString(), html);
assertContains("href=\"http", html);
+
+ // Check our details were found
+ assertContains("GET", html);
+ assertContains(WELCOME_PATH, html);
+ assertContains("text/plain", html);
+ assertContains("text/html", html);
+
+ // Check that the Tika Version details come through too
+ assertContains(VERSION_PATH, html);
}
@Test
@@ -64,7 +78,15 @@ public class TikaWelcomeTest extends CXF
.accept("text/plain")
.get();
- assertContains(new Tika().toString(),
- getStringFromInputStream((InputStream) response.getEntity()));
+ String text = getStringFromInputStream((InputStream) response.getEntity());
+ assertContains(new Tika().toString(), text);
+
+ // Check our details were found
+ assertContains("GET " + WELCOME_PATH, text);
+ assertContains("=> text/plain", text);
+ assertContains("=> text/html", text);
+
+ // Check that the Tika Version details come through too
+ assertContains("GET " + VERSION_PATH, text);
}
}