You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/12/26 15:16:49 UTC

juneau git commit: New RESTCLIENT_query setting.

Repository: juneau
Updated Branches:
  refs/heads/master 210a6deb5 -> dbf4f127c


New RESTCLIENT_query setting.

Project: http://git-wip-us.apache.org/repos/asf/juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/juneau/commit/dbf4f127
Tree: http://git-wip-us.apache.org/repos/asf/juneau/tree/dbf4f127
Diff: http://git-wip-us.apache.org/repos/asf/juneau/diff/dbf4f127

Branch: refs/heads/master
Commit: dbf4f127c6368853e4329545898a512d5cb2a91c
Parents: 210a6de
Author: JamesBognar <ja...@apache.org>
Authored: Tue Dec 26 10:16:53 2017 -0500
Committer: JamesBognar <ja...@apache.org>
Committed: Tue Dec 26 10:16:53 2017 -0500

----------------------------------------------------------------------
 juneau-core/juneau-marshall/TODO.txt            |   5 +-
 juneau-doc/src/main/javadoc/overview.html       |   8 +
 .../juneau/examples/rest/RootResources.java     |  11 ++
 .../examples/rest/ContentComboTestcase.java     | 107 +++++++++++++
 .../juneau/examples/rest/RootContentTest.java   | 156 +++++++++++++++++++
 .../apache/juneau/examples/rest/_TestSuite.java |   1 +
 .../apache/juneau/rest/client/RestClient.java   |  27 +++-
 .../juneau/rest/client/RestClientBuilder.java   |  12 ++
 .../org/apache/juneau/rest/styles/dark.css      |   2 +
 .../org/apache/juneau/rest/styles/devops.css    |   2 +
 .../org/apache/juneau/rest/styles/light.css     |   2 +
 .../org/apache/juneau/rest/styles/original.css  |   2 +
 12 files changed, 330 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-core/juneau-marshall/TODO.txt
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/TODO.txt b/juneau-core/juneau-marshall/TODO.txt
index 4beb978..385d851 100644
--- a/juneau-core/juneau-marshall/TODO.txt
+++ b/juneau-core/juneau-marshall/TODO.txt
@@ -15,4 +15,7 @@ Create tests that ensure serializers don't close output but parsers do close inp
 
 $R{servletDescription} tags showing up in REST examples.
 Examples should use dark LAF.
-Content tests on examples rest.
\ No newline at end of file
+Content tests on examples rest.
+HTML root resources page lists .menu_item style twice in header.
+REST example showing how to use NLS.
+REST example showing how to customize look-and-feel.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-doc/src/main/javadoc/overview.html
----------------------------------------------------------------------
diff --git a/juneau-doc/src/main/javadoc/overview.html b/juneau-doc/src/main/javadoc/overview.html
index 94a2e10..47589ca 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -7734,6 +7734,14 @@
 				</ul>
 		</ul>
 
+		<h6 class='topic'>juneau-rest-client</h6>
+		<ul class='spaced-list'>
+			<li>
+				New configuration property {@link org.apache.juneau.rest.client.RestClient#RESTCLIENT_query} and
+				builder method {@link org.apache.juneau.rest.client.RestClientBuilder#query(String,Object)}.
+		</ul>
+		
+		
 		<h6 class='topic'>juneau-microservice-server</h6>
 		<ul class='spaced-list'>
 		</ul>

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
----------------------------------------------------------------------
diff --git a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
index a2d618e..f643c13 100644
--- a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
+++ b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
@@ -12,6 +12,8 @@
 // ***************************************************************************************************************************
 package org.apache.juneau.examples.rest;
 
+import static org.apache.juneau.serializer.Serializer.*;
+
 import org.apache.juneau.examples.rest.addressbook.*;
 import org.apache.juneau.microservice.*;
 import org.apache.juneau.microservice.resources.*;
@@ -49,6 +51,12 @@ import org.apache.juneau.rest.widget.*;
 		},
 		footer="$W{PoweredByApache}"
 	),
+	properties={
+		// For testing purposes, we want to use single quotes in all the serializers so it's easier to do simple
+		// String comparisons.
+		// You can apply any of the Serializer/Parser/BeanContext settings this way.
+		@Property(name=SERIALIZER_quoteChar, value="'")
+	},
 	children={
 		HelloWorldResource.class,
 		PetStoreResource.class,
@@ -73,5 +81,8 @@ import org.apache.juneau.rest.widget.*;
 	}
 )
 public class RootResources extends ResourceJenaGroup {
+	// IMPORTANT!  If you don't need RDF support, change the parent class to ResourceGroup.
+	// It allows you to remove the Jena prerequisite.
+
 	private static final long serialVersionUID = 1L;
 }

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/ContentComboTestcase.java
----------------------------------------------------------------------
diff --git a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/ContentComboTestcase.java b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/ContentComboTestcase.java
new file mode 100644
index 0000000..6474d76
--- /dev/null
+++ b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/ContentComboTestcase.java
@@ -0,0 +1,107 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
+// * with the License.  You may obtain a copy of the License at                                                              * 
+// *                                                                                                                         *
+// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+// *                                                                                                                         *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+// * specific language governing permissions and limitations under the License.                                              *
+// ***************************************************************************************************************************
+package org.apache.juneau.examples.rest;
+
+import java.io.*;
+import java.util.*;
+
+import org.apache.juneau.*;
+import org.apache.juneau.csv.*;
+import org.apache.juneau.html.*;
+import org.apache.juneau.http.*;
+import org.apache.juneau.jena.*;
+import org.apache.juneau.json.*;
+import org.apache.juneau.msgpack.*;
+import org.apache.juneau.parser.*;
+import org.apache.juneau.plaintext.*;
+import org.apache.juneau.rest.client.*;
+import org.apache.juneau.serializer.*;
+import org.apache.juneau.uon.*;
+import org.apache.juneau.urlencoding.*;
+import org.apache.juneau.xml.*;
+import org.junit.*;
+
+public class ContentComboTestcase extends RestTestcase {
+	
+	// Reusable RestClients keyed by label that live for the duration of a testcase class.
+	private static Map<String,RestClient> clients = new LinkedHashMap<>();
+
+	protected RestClient getClient(MediaType mediaType) {
+		String mt = mediaType.toString();
+		switch (mt) {
+			case "text/csv": return getClient(mt, CsvSerializer.DEFAULT, CsvParser.DEFAULT);
+			case "text/html": return getClient(mt, HtmlSerializer.DEFAULT, HtmlParser.DEFAULT);
+			case "application/json": return getClient(mt, JsonSerializer.DEFAULT, JsonParser.DEFAULT);
+			case "octal/msgpack": return getClient(mt, MsgPackSerializer.DEFAULT, MsgPackParser.DEFAULT).builder().query("plainText","true").build();
+			case "text/plain": return getClient(mt, PlainTextSerializer.DEFAULT, PlainTextParser.DEFAULT);
+			case "text/uon": return getClient(mt, UonSerializer.DEFAULT, UonParser.DEFAULT);
+			case "application/x-www-form-urlencoded": return getClient(mt, UrlEncodingSerializer.DEFAULT, UrlEncodingParser.DEFAULT);
+			case "text/xml": return getClient(mt, XmlSerializer.DEFAULT, XmlParser.DEFAULT);
+			case "text/xml+rdf": return getClient(mt, RdfSerializer.DEFAULT_XML, RdfParser.DEFAULT_XML);
+			case "text/n-triple": return getClient(mt, RdfSerializer.DEFAULT_NTRIPLE, RdfParser.DEFAULT_NTRIPLE);
+			case "text/turtle": return getClient(mt, RdfSerializer.DEFAULT_TURTLE, RdfParser.DEFAULT_TURTLE);
+			case "text/n3": return getClient(mt, RdfSerializer.DEFAULT_N3, RdfParser.DEFAULT_N3);
+			default: throw new FormattedRuntimeException("Client for mediaType ''{0}'' not found", mt);
+		}
+	}
+	
+	protected RestClient getClient(String label, Serializer serializer, Parser parser) {
+		if (! clients.containsKey(label))
+			clients.put(label, SamplesMicroservice.client(serializer, parser).pooled().build());
+		return clients.get(label);
+	}
+
+	@AfterClass
+	public static void tearDown() {
+		for (RestClient rc : clients.values()) {
+			try {
+				rc.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+		clients.clear();
+	}
+
+	public static class ComboInput {
+		public final String name, url;
+		public final MediaType mediaType;
+		public final String[] expectedResults;
+		
+		public ComboInput(String name, String url, MediaType mediaType, String...expectedResults) {
+			this.name = name;
+			this.url = url;
+			this.mediaType = mediaType;
+			this.expectedResults = expectedResults;
+		}
+	}
+
+	
+	private final ComboInput comboInput;
+	
+	public ContentComboTestcase(ComboInput comboInput) {
+		this.comboInput = comboInput;
+	}
+
+	@Test
+	public void doTest() throws Exception {
+		RestClient rc = getClient(comboInput.mediaType);
+		String s = rc.doGet(comboInput.url).getResponseAsString();
+		for (String s2 : comboInput.expectedResults) {
+			if (! s.contains(s2)) {
+				System.err.println(s);
+				throw new FormattedRuntimeException("String ''{0}'' not found at URL ''{1}'' for media type ''{2}''", s2, comboInput.url, comboInput.mediaType);
+			}
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
----------------------------------------------------------------------
diff --git a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
new file mode 100644
index 0000000..8cd0bb1
--- /dev/null
+++ b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/RootContentTest.java
@@ -0,0 +1,156 @@
+// ***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+// * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            *
+// * with the License.  You may obtain a copy of the License at                                                              * 
+// *                                                                                                                         *
+// *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+// *                                                                                                                         *
+// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+// * specific language governing permissions and limitations under the License.                                              *
+// ***************************************************************************************************************************
+package org.apache.juneau.examples.rest;
+
+import java.util.*;
+
+import org.apache.juneau.http.*;
+import org.junit.runner.*;
+import org.junit.runners.*;
+
+@RunWith(Parameterized.class)
+public class RootContentTest extends ContentComboTestcase {
+
+	@Parameterized.Parameters
+	public static Collection<Object[]> getParameters() {
+		return Arrays.asList(new Object[][] {
+			{ 	/* 0 */
+				new ComboInput("HTML-stylesheet", "/", MediaType.HTML,
+					"@import '/styles/devops.css';",
+					".menu-item {"
+				)
+			},
+			{ 	/* 1 */
+				new ComboInput("HTML-stylesheet-contnt", "/styles/devops.css", MediaType.PLAIN,
+					"/** DevOps look-and-feel */"
+				)
+			},
+			{ 	/* 2 */
+				new ComboInput("HTML-header", "/", MediaType.HTML,
+					"<head>",
+					"<h1>Root resources</h1>",
+					"<h2>Example of a router resource page.</h2>",
+					"<img src='/htdocs/juneau.png' style='position:absolute;top:5;right:5;background-color:transparent;height:30px'/>"
+				)
+			},
+			{ 	/* 3 */
+				new ComboInput("HTML-nav", "/", MediaType.HTML,
+					"<nav>",
+					"<a href='/?method=OPTIONS'>options</a>",
+					"<a class='link' onclick='menuClick(this)'>content-type</a>",
+					"<a class='link' onclick='menuClick(this)'>styles</a>",
+					"<a href='https://github.com/apache/juneau/blob/master/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java'>source</a>"
+				)
+			},
+			{ 	/* 4 */
+				new ComboInput("HTML-nav-popup-contentType", "/", MediaType.HTML,
+					"<div class='popup-content'>",
+					"<a href='/?plainText=true&Accept=application%2Fjson'>application/json</a>"
+				)
+			},
+			{ 	/* 5 */
+				new ComboInput("HTML-nav-popup-styles", "/", MediaType.HTML,
+					"<a href='/?stylesheet=styles%2Fdevops.css'>devops</a>",
+					"<a href='/?stylesheet=styles%2Flight.css'>light</a>",
+					"<a href='/?stylesheet=styles%2Foriginal.css'>original</a>",
+					"<a href='/?stylesheet=styles%2Fdark.css'>dark</a>"
+				)
+			},
+			{ 	/* 6 */
+				new ComboInput("HTML-aside", "/", MediaType.HTML,
+					"<aside>",
+					"<p>This is an example of a 'router' page that serves as a jumping-off point to child resources.</p>",
+					"<p>Other features (such as this aside) are added through annotations.</p>"
+				)
+			},
+			{ 	/* 7 */
+				new ComboInput("HTML-footer", "/", MediaType.HTML,
+					"<footer>",
+					"<img style='float:right;padding-right:20px;height:32px' src='/htdocs/asf.png'>"
+				)
+			},
+			{ 	/* 8 */
+				new ComboInput("HTML-content-text/html", "/", MediaType.HTML,
+					"<a href='/helloWorld'>helloWorld</a>",
+					"<td>Hello World</td>"
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-application/json", "/", MediaType.JSON,
+					"'name':'helloWorld',",
+					"'description':'Hello World'"
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-octal/msgpack", "/", MediaType.MSGPACK,
+					"",
+					""
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-text/plain", "/", MediaType.PLAIN,
+					"",
+					""
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-text/uon", "/", MediaType.UON,
+					"",
+					""
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-application/x-www-form-urlencoded", "/", MediaType.URLENCODING,
+					"",
+					""
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-text/xml", "/", MediaType.XML,
+					"",
+					""
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-text/xml+rdf", "/", MediaType.RDF,
+					"",
+					""
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-text/n-triple", "/", MediaType.NTRIPLE,
+					"",
+					""
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-text/turtle", "/", MediaType.TURTLE,
+					"",
+					""
+				)
+			},
+			{ 	/* 9 */
+				new ComboInput("HTML-content-text/n3", "/", MediaType.N3,
+					"",
+					""
+				)
+			}
+
+		});
+	}
+
+
+	public RootContentTest(ComboInput comboInput) {
+		super(comboInput);
+	}
+}

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
----------------------------------------------------------------------
diff --git a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
index ad77cd4..201edd7 100644
--- a/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
+++ b/juneau-examples/juneau-examples-rest/src/test/java/org/apache/juneau/examples/rest/_TestSuite.java
@@ -26,6 +26,7 @@ import org.junit.runners.Suite.*;
 @SuiteClasses({
 	AddressBookResourceTest.class,
 	RootResourcesTest.class,
+	RootContentTest.class,
 	SampleRemoteableServicesResourceTest.class,
 	TestMultiPartFormPostsTest.class
 })

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 599200d..9e0c2b4 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -167,11 +167,25 @@ public class RestClient extends BeanContext {
 	 * </ul>
 	 *
 	 * <p>
-	 * Don't close this client when the {@link RestClient#close()} method is called.
+	 * Headers to add to every request.
 	 */
 	public static final String RESTCLIENT_headers = PREFIX + "headers.ms";
 
 	/**
+	 * <b>Configuration property:</b>  Request query parameters.
+	 *
+	 * <ul>
+	 * 	<li><b>Name:</b> <js>"RestClient.query.ms"</js>
+	 * 	<li><b>Data type:</b> <code>Map&lt;String,String&gt;</code>
+	 * 	<li><b>Default:</b> empty map
+	 * </ul>
+	 *
+	 * <p>
+	 * Query parameters to add to every request.
+	 */
+	public static final String RESTCLIENT_query = PREFIX + "query.ms";
+
+	/**
 	 * <b>Configuration property:</b>  Serializer.
 	 *
 	 * <ul>
@@ -274,7 +288,7 @@ public class RestClient extends BeanContext {
 
 	private static final ConcurrentHashMap<Class,PartSerializer> partSerializerCache = new ConcurrentHashMap<>();
 	
-	private final Map<String,String> headers;
+	private final Map<String,String> headers, query;
 	private final HttpClientBuilder httpClientBuilder;
 	private final CloseableHttpClient httpClient;
 	private final boolean keepHttpClientOpen, debug;
@@ -350,6 +364,7 @@ public class RestClient extends BeanContext {
 		this.httpClient = httpClient;
 		this.keepHttpClientOpen = getProperty(RESTCLIENT_keepHttpClientOpen, boolean.class, false);
 		this.headers = getMapProperty(RESTCLIENT_headers, String.class);
+		this.query = getMapProperty(RESTCLIENT_query, String.class);
 		this.retries = getProperty(RESTCLIENT_retries, int.class, 1);
 		this.retryInterval = getProperty(RESTCLIENT_retryInterval, int.class, -1);
 		this.retryOn = getInstanceProperty(RESTCLIENT_retryOn, RetryOn.class, RetryOn.DEFAULT);
@@ -754,9 +769,13 @@ public class RestClient extends BeanContext {
 		} catch (URISyntaxException e1) {
 			throw new RestCallException(e1);
 		}
-		for (Map.Entry<String,? extends Object> e : headers.entrySet())
-			restCall.header(e.getKey(), e.getValue());
+		
+		for (Map.Entry<String,String> e : query.entrySet())
+			restCall.query(e.getKey(), e.getValue());
 
+		for (Map.Entry<String,String> e : headers.entrySet())
+			restCall.header(e.getKey(), e.getValue());
+		
 		if (parser != null && ! req.containsHeader("Accept"))
 			req.setHeader("Accept", parser.getPrimaryMediaType().toString());
 

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index 660d6e8..c5e786b 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -847,6 +847,18 @@ public class RestClientBuilder extends BeanContextBuilder {
 	}
 
 	/**
+	 * <b>Configuration property:</b>  Request query parameters.
+	 *
+	 * @param key The query parameter name.
+	 * @param value The query parameter value value.
+	 * @return This object (for method chaining).
+	 * @see RestClient#RESTCLIENT_query
+	 */
+	public RestClientBuilder query(String key, Object value) {
+		return addTo(RESTCLIENT_query, key, value);
+	}
+
+	/**
 	 * Sets the {@link Serializer#SERIALIZER_maxDepth} property on all serializers in this group.
 	 *
 	 * @param value The new value for this property.

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/dark.css
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/dark.css b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/dark.css
index e1ef349..c567dc9 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/dark.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/dark.css
@@ -11,6 +11,8 @@
  * specific language governing permissions and limitations under the License.                                              *
  ***************************************************************************************************************************/
  
+/** Dark look-and-feel */ 
+ 
 /**********************************************************************************************************************/
 /**  Body                                                                                                            **/
 /**********************************************************************************************************************/

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/devops.css
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/devops.css b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/devops.css
index 487eae7..b25c9ed 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/devops.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/devops.css
@@ -11,6 +11,8 @@
  * specific language governing permissions and limitations under the License.                                              *
  ***************************************************************************************************************************/
  
+/** DevOps look-and-feel */ 
+ 
 /**********************************************************************************************************************/
 /**  Body                                                                                                            **/
 /**********************************************************************************************************************/

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/light.css
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/light.css b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/light.css
index 59a641c..63ccf7e 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/light.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/light.css
@@ -11,6 +11,8 @@
  * specific language governing permissions and limitations under the License.                                              *
  ***************************************************************************************************************************/
  
+/** Light look-and-feel */ 
+ 
 /**********************************************************************************************************************/
 /**  Body                                                                                                            **/
 /**********************************************************************************************************************/

http://git-wip-us.apache.org/repos/asf/juneau/blob/dbf4f127/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/original.css
----------------------------------------------------------------------
diff --git a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/original.css b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/original.css
index 3b4aa44..478acc1 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/original.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/styles/original.css
@@ -11,6 +11,8 @@
  * specific language governing permissions and limitations under the License.                                              *
  ***************************************************************************************************************************/
 
+/** Original look-and-feel */ 
+ 
 /**********************************************************************************************************************/
 /**  Body                                                                                                            **/
 /**********************************************************************************************************************/