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 2016/08/01 16:03:27 UTC
[22/51] [abbrv] [partial] incubator-juneau git commit: Merge changes
from GitHub repo.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/RestServletJenaDefault.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/RestServletJenaDefault.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/RestServletJenaDefault.java
deleted file mode 100755
index 00cb56a..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/RestServletJenaDefault.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.jena;
-
-import static org.apache.juneau.html.HtmlDocSerializerContext.*;
-import static org.apache.juneau.server.RestServletContext.*;
-
-import org.apache.juneau.html.*;
-import org.apache.juneau.jena.*;
-import org.apache.juneau.jso.*;
-import org.apache.juneau.json.*;
-import org.apache.juneau.msgpack.*;
-import org.apache.juneau.plaintext.*;
-import org.apache.juneau.server.*;
-import org.apache.juneau.server.annotation.*;
-import org.apache.juneau.server.labels.*;
-import org.apache.juneau.soap.*;
-import org.apache.juneau.urlencoding.*;
-import org.apache.juneau.xml.*;
-
-/**
- * Subclass of {@link RestServlet} with default sets of serializers and parsers that include RDF support.
- * <p>
- * Extends the {@link org.apache.juneau.server.RestServletDefault} class with additional RDF support.
- * <p>
- * <p>
- * Supports the following request <code>Accept</code> header values with the resulting response <code>Content-Type</code>:
- * </p>
- * <table class='styled'>
- * <tr>
- * <th>Accept</th>
- * <th>Content-Type</th>
- * <th>Serializer</th>
- * </tr>
- * <tr>
- * <td class='code'>application/json<br>text/json</td>
- * <td class='code'>application/json</td>
- * <td>{@link JsonSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>application/json+simple<br>text/json+simple</td>
- * <td class='code'>application/json</td>
- * <td>{@link org.apache.juneau.json.JsonSerializer.Simple}</td>
- * </tr>
- * <td class='code'>application/json+schema<br>text/json+schema</td>
- * <td class='code'>application/json</td>
- * <td>{@link JsonSchemaSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/xml</td>
- * <td class='code'>text/xml</td>
- * <td>{@link XmlDocSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/xml+schema</td>
- * <td class='code'>text/xml</td>
- * <td>{@link XmlSchemaDocSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/html</td>
- * <td class='code'>text/html</td>
- * <td>{@link HtmlDocSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/html+stripped</td>
- * <td class='code'>text/html</td>
- * <td>{@link HtmlStrippedDocSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/uon</td>
- * <td class='code'>text/uon</td>
- * <td>{@link UonSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/uon-simple</td>
- * <td class='code'>text/uon</td>
- * <td>{@link org.apache.juneau.urlencoding.UonSerializer.Simple}</td>
- * </tr>
- * <tr>
- * <td class='code'>application/x-www-form-urlencoded</td>
- * <td class='code'>application/x-www-form-urlencoded</td>
- * <td>{@link UrlEncodingSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>application/x-www-form-urlencoded-simple</td>
- * <td class='code'>application/x-www-form-urlencoded</td>
- * <td>{@link org.apache.juneau.urlencoding.UrlEncodingSerializer.Simple}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/xml+soap</td>
- * <td class='code'>text/xml</td>
- * <td>{@link SoapXmlSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/plain</td>
- * <td class='code'>text/plain</td>
- * <td>{@link PlainTextSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/plain</td>
- * <td class='code'>text/plain</td>
- * <td>{@link PlainTextSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>application/x-java-serialized-object</td>
- * <td class='code'>application/x-java-serialized-object</td>
- * <td>{@link JavaSerializedObjectSerializer}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/xml+rdf</td>
- * <td class='code'>text/xml+rdf</td>
- * <td>{@link org.apache.juneau.jena.RdfSerializer.Xml}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/xml+rdf+abbrev</td>
- * <td class='code'>text/xml+rdf</td>
- * <td>{@link org.apache.juneau.jena.RdfSerializer.XmlAbbrev}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/n3</td>
- * <td class='code'>text/n3</td>
- * <td>{@link org.apache.juneau.jena.RdfSerializer.N3}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/n-triple</td>
- * <td class='code'>text/n-triple</td>
- * <td>{@link org.apache.juneau.jena.RdfSerializer.NTriple}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/turtle</td>
- * <td class='code'>text/turtle</td>
- * <td>{@link org.apache.juneau.jena.RdfSerializer.Turtle}</td>
- * </tr>
- * </table>
- * <p>
- * Supports the following request <code>Content-Type</code> header values:
- * </p>
- * <table class='styled'>
- * <tr>
- * <th>Content-Type</th>
- * <th>Parser</th>
- * </tr>
- * <tr>
- * <td class='code'>application/json<br>text/json</td>
- * <td>{@link JsonParser}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/xml<br>application/xml</td>
- * <td>{@link XmlParser}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/html<br>text/html+stripped</td>
- * <td>{@link HtmlParser}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/uon</td>
- * <td>{@link UonParser}</td>
- * </tr>
- * <tr>
- * <td class='code'>application/x-www-form-urlencoded</td>
- * <td>{@link UrlEncodingParser}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/plain</td>
- * <td>{@link PlainTextParser}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/xml+rdf</td>
- * <td>{@link org.apache.juneau.jena.RdfParser.Xml}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/n3</td>
- * <td>{@link org.apache.juneau.jena.RdfParser.N3}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/n-triple</td>
- * <td>{@link org.apache.juneau.jena.RdfParser.NTriple}</td>
- * </tr>
- * <tr>
- * <td class='code'>text/turtle</td>
- * <td>{@link org.apache.juneau.jena.RdfParser.Turtle}</td>
- * </tr>
- * </table>
- * <p>
- * Note that the list of serializers and parsers can be appended to using the {@link RestResource#serializers() @RestResource.serializers()}
- * and {@link RestResource#parsers() @RestResource.parsers()} annotations on subclasses.
- * </p>
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-@RestResource(
- serializers={
- HtmlDocSerializer.class, // HTML must be listed first because Internet Explore does not include text/html in their Accept header.
- HtmlStrippedDocSerializer.class,
- HtmlSchemaDocSerializer.class,
- JsonSerializer.class,
- JsonSerializer.Simple.class,
- JsonSchemaSerializer.class,
- XmlDocSerializer.class,
- XmlDocSerializer.Simple.class,
- XmlSchemaDocSerializer.class,
- UonSerializer.class,
- UonSerializer.Simple.class,
- UrlEncodingSerializer.class,
- UrlEncodingSerializer.Simple.class,
- MsgPackSerializer.class,
- SoapXmlSerializer.class,
- JavaSerializedObjectSerializer.class,
- PlainTextSerializer.class,
- RdfSerializer.Xml.class,
- RdfSerializer.XmlAbbrev.class,
- RdfSerializer.N3.class,
- RdfSerializer.NTriple.class,
- RdfSerializer.Turtle.class,
- },
- parsers={
- JsonParser.class,
- XmlParser.class,
- HtmlParser.class,
- UonParser.class,
- UrlEncodingParser.class,
- MsgPackParser.class,
- RdfParser.Xml.class,
- RdfParser.N3.class,
- RdfParser.NTriple.class,
- RdfParser.Turtle.class
- },
- properties={
- // Allow &method parameter on safe HTTP methods.
- @Property(name=REST_allowMethodParam, value="OPTIONS"),
- // Provide a default title on HTML pages.
- @Property(name=HTMLDOC_title, value="$R{servletLabel}"),
- // Provide a default description on HTML pages.
- @Property(name=HTMLDOC_description, value="$R{servletDescription}")
- },
- stylesheet="styles/juneau.css",
- favicon="juneau.ico",
- staticFiles="{htdocs:'htdocs'}"
-)
-public abstract class RestServletJenaDefault extends RestServlet {
- private static final long serialVersionUID = 1L;
-
- /**
- * [OPTIONS /*] - Show resource options.
- *
- * @param req The HTTP request.
- * @return The bean containing the contents of the OPTIONS page.
- *
- */
- @RestMethod(name="OPTIONS", path="/*",
- properties={
- @Property(name=HTMLDOC_links, value="{back:'$R{servletURI}'}"),
- @Property(name=HTMLDOC_description, value="Resource options")
- },
- description="Resource options"
- )
- public ResourceOptions getOptions(RestRequest req) {
- return new ResourceOptions(this, req);
- }
-
- @Override /* RestServlet */
- public boolean hasOptionsPage() {
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/RestServletJenaGroupDefault.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/RestServletJenaGroupDefault.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/RestServletJenaGroupDefault.java
deleted file mode 100755
index 56e16f4..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/RestServletJenaGroupDefault.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.jena;
-
-import org.apache.juneau.server.*;
-import org.apache.juneau.server.annotation.*;
-import org.apache.juneau.server.labels.*;
-
-/**
- * Specialized subclass of {@link RestServletJenaDefault} for showing "group" pages.
- * <p>
- * Group pages consist of simple lists of child resource URLs and their labels.
- * They're meant to be used as jumping-off points for child resources.
- * <p>
- * Child resources are specified using the {@link RestResource#children()} annotation.
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-@RestResource()
-public abstract class RestServletJenaGroupDefault extends RestServletJenaDefault {
- private static final long serialVersionUID = 1L;
-
- /**
- * [GET /] - Get child resources.
- *
- * @param req The HTTP request
- * @return The bean containing links to the child resources.
- */
- @RestMethod(name="GET", path="/", description="Child resources")
- public ChildResourceDescriptions getChildren(RestRequest req) {
- return new ChildResourceDescriptions(this, req);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/package.html
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/package.html b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/package.html
deleted file mode 100755
index 3fe0832..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/jena/package.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * 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.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <style type="text/css">
- /* For viewing in Page Designer */
- @IMPORT url("../../../../../javadoc.css");
-
- /* For viewing in REST interface */
- @IMPORT url("../htdocs/javadoc.css");
- body {
- margin: 20px;
- }
- </style>
- <script>
- /* Replace all @code and @link tags. */
- window.onload = function() {
- document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
- document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
- }
- </script>
-</head>
-<body>
-<p>RET servlet API with Jena components</p>
-
-<p>
- Contains predefined instances of REST API classes with Jena support included.
-</p>
-
-
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/juneau.ico
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/juneau.ico b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/juneau.ico
deleted file mode 100755
index 737f40a..0000000
Binary files a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/juneau.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/BeanDescription.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/BeanDescription.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/BeanDescription.java
deleted file mode 100755
index dc4eade..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/BeanDescription.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import org.apache.juneau.*;
-import org.apache.juneau.annotation.*;
-
-/**
- * Simple serializable bean description.
- * <p>
- * Given a particular class type, this serializes the class into
- * the fully-qualified class name and the properties associated with the class.
- * <p>
- * Useful for rendering simple information about a bean during REST OPTIONS requests.
- *
- * @param <T> The class type of the bean.
- * @author James Bognar (james.bognar@salesforce.com)
- */
-@Bean(properties={"type","properties"})
-public final class BeanDescription<T> {
-
- /** The bean class type. */
- public String type;
-
- /** The bean properties. */
- public BeanPropertyDescription[] properties;
-
- /**
- * Constructor
- * @param c The bean class type.
- */
- public BeanDescription(Class<T> c) {
- type = c.getName();
- BeanMeta<T> bm = BeanContext.DEFAULT.getBeanMeta(c);
- properties = new BeanPropertyDescription[bm.getPropertyMetas().size()];
- int i = 0;
- for (BeanPropertyMeta<T> pm : bm.getPropertyMetas())
- properties[i++] = new BeanPropertyDescription(pm.getName(), pm.getClassMeta());
- }
-
- /**
- * Information about a bean property.
- */
- public static class BeanPropertyDescription {
-
- /** The bean property name. */
- public String name;
-
- /** The bean property filtered class type. */
- public String type;
-
- /**
- * Constructor.
- *
- * @param name The bean property name.
- * @param type The bean property class type.
- */
- public BeanPropertyDescription(String name, ClassMeta<?> type) {
- this.name = name;
- this.type = type.getTransformedClassMeta().toString();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ChildResourceDescriptions.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ChildResourceDescriptions.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ChildResourceDescriptions.java
deleted file mode 100755
index f965673..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ChildResourceDescriptions.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import java.util.*;
-
-import org.apache.juneau.server.*;
-
-/**
- * A POJO structure that describes the list of child resources associated with a resource.
- * <p>
- * Typically used in top-level GET methods of router resources to render a list of
- * available child resources.
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-public class ChildResourceDescriptions extends LinkedList<ResourceDescription> {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor.
- *
- * @param servlet The servlet that this bean describes.
- * @param req The HTTP servlet request.
- */
- public ChildResourceDescriptions(RestServlet servlet, RestRequest req) {
- this(servlet, req, false);
- }
-
- /**
- * Constructor.
- *
- * @param servlet The servlet that this bean describes.
- * @param req The HTTP servlet request.
- * @param sort If <jk>true</jk>, list will be ordered by name alphabetically.
- * Default is to maintain the order as specified in the annotation.
- */
- public ChildResourceDescriptions(RestServlet servlet, RestRequest req, boolean sort) {
- String uri = req.getTrimmedRequestURI();
- for (Map.Entry<String,RestServlet> e : servlet.getChildResources().entrySet())
- add(new ResourceDescription(uri, e.getKey(), e.getValue().getLabel(req)));
- if (sort)
- Collections.sort(this);
- }
-
- /**
- * Bean constructor.
- */
- public ChildResourceDescriptions() {
- super();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/DefaultLabels.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/DefaultLabels.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/DefaultLabels.java
deleted file mode 100755
index f55f64c..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/DefaultLabels.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import static java.lang.String.*;
-
-import java.util.*;
-
-import org.apache.juneau.server.converters.*;
-
-/**
- * Reusable label constructs for REST OPTIONS requests.
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-public final class DefaultLabels {
-
- private static String
- bundleName = DefaultLabels.class.getPackage().getName() + ".nls.DefaultLabels",
- typeKey = "%s.%s.type", // "{category}.{name}.type"
- descKey = "%s.%s.desc"; // "{catetory}.{name}.desc"
-
- private static Map<Locale,ParamDescription[]> queryableParams = new HashMap<Locale,ParamDescription[]>();
- private static Map<Locale,ParamDescription[]> headerParams = new HashMap<Locale,ParamDescription[]>();
-
- /**
- * OPTIONS request labels for query/view/sort/paging features on POJOs
- * when {@link Queryable} filter is associated with a resource method.
- * @param locale The client locale.
- * @return A list of localized parameter descriptions.
- */
- public static ParamDescription[] getQueryableParamDescriptions(Locale locale) {
- if (! queryableParams.containsKey(locale)) {
- ResourceBundle rb = ResourceBundle.getBundle(bundleName, locale);
- String category = "QueryableParam";
- String[] p = {"q","v","s","g","i","p","l"};
- ParamDescription[] l = new ParamDescription[p.length];
- for (int i = 0; i < p.length; i++)
- l[i] = new ParamDescription(p[i],
- rb.getString(format(typeKey, category, p[i])),
- rb.getString(format(descKey, category, p[i]))
- );
- queryableParams.put(locale, l);
- }
- return queryableParams.get(locale);
- }
-
- /**
- * OPTIONS request labels for header values that can be specified as GET parameters.
- * @param locale The client locale.
- * @return A list of localized parameter descriptions.
- */
- public static ParamDescription[] getHeaderParamDescriptions(Locale locale) {
- if (! headerParams.containsKey(locale)) {
- ResourceBundle rb = ResourceBundle.getBundle(bundleName, locale);
- String category = "HeaderParam";
- String[] p = {"Accept","Accept-Encoding","Method","Content","plainText"};
- ParamDescription[] l = new ParamDescription[p.length];
- for (int i = 0; i < p.length; i++)
- l[i] = new ParamDescription(p[i],
- rb.getString(format(typeKey, category, p[i])),
- rb.getString(format(descKey, category, p[i]))
- );
- headerParams.put(locale, l);
- }
- return headerParams.get(locale);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/MethodDescription.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/MethodDescription.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/MethodDescription.java
deleted file mode 100755
index bee688a..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/MethodDescription.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import java.util.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-import org.apache.juneau.server.*;
-
-/**
- * Simple bean for describing REST methods.
- * <p>
- * Primarily used for constructing tables with name/path/description/... columns on REST OPTIONS requests.
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-@Bean(properties={"httpMethod","path","javaMethod","description","input","responses","consumes","produces","matchers","guards","converters"})
-public final class MethodDescription implements Comparable<MethodDescription> {
- private String javaMethod, httpMethod, path, description;
- private String[] guards, converters, matchers;
- private Set<Var> requestVars = new TreeSet<Var>();
- private Map<Integer,Response> responses = new TreeMap<Integer,Response>();
- private Collection<String> consumes, produces;
- private int httpMethodOrder;
-
- /**
- * A possible response status.
- */
- public static class Response {
-
- /** HTTP status code */
- public int status;
-
- /** Response description */
- public String description;
-
- /** Response headers set */
- public Set<Var> output = new TreeSet<Var>();
-
- /** Bean constructor */
- public Response() {}
-
- /**
- * Constructor.
- *
- * @param status HTTP status code.
- */
- public Response(int status) {
- this.status = status;
- this.description = RestUtils.getHttpResponseText(status);
- }
-
- /**
- * Add a response variable to this response.
- *
- * @param category The response variable category (typically only <js>"header"</js>).
- * @param name The response variable name.
- * @return The new variable object whose fields can be updated.
- */
- public Var addResponseVar(String category, String name) {
- for (Var v : output)
- if (v.matches(category, name))
- return v;
- Var v = new Var(category, name);
- output.add(v);
- return v;
- }
-
- /**
- * Sets the description for this response.
- *
- * @param description The new description.
- * @return This object (for method chaining).
- */
- public Response setDescription(String description) {
- this.description = description;
- return this;
- }
- }
-
- /** Constructor. */
- public MethodDescription() {}
-
- /**
- * Returns the javaMethod field on this label.
- *
- * @return The name.
- */
- public String getJavaMethod() {
- return javaMethod;
- }
-
- /**
- * Sets the javaMethod field on this label to a new value.
- *
- * @param javaMethod The new name.
- * @return This object (for method chaining).
- */
- public MethodDescription setJavaMethod(String javaMethod) {
- this.javaMethod = javaMethod;
- return this;
- }
-
- /**
- * Returns the httpMethod field on this label.
- *
- * @return The name.
- */
- public String getHttpMethod() {
- return httpMethod;
- }
-
- /**
- * Sets the httpMethod field on this label to a new value.
- *
- * @param httpMethod The new name.
- * @return This object (for method chaining).
- */
- public MethodDescription setHttpMethod(String httpMethod) {
- this.httpMethod = httpMethod;
- this.httpMethodOrder = (httpMethodOrders.containsKey(httpMethod) ? httpMethodOrders.get(httpMethod) : 10);
- return this;
- }
-
- /**
- * Returns the path field on this label.
- *
- * @return The path.
- */
- public String getPath() {
- return path;
- }
-
- /**
- * Sets the path field on this label to a new value.
- *
- * @param path The new path.
- * @return This object (for method chaining).
- */
- public MethodDescription setPath(String path) {
- this.path = path;
- return this;
- }
-
- /**
- * Returns the description field on this label.
- *
- * @return The description.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets the description field on this label to a new value.
- *
- * @param description The new description.
- * @return This object (for method chaining).
- */
- public MethodDescription setDescription(String description) {
- this.description = description;
- return this;
- }
-
- /**
- * Returns the vars field on this label.
- *
- * @return The vars.
- */
- public Collection<Var> getInput() {
- return requestVars;
- }
-
- /**
- * Returns the possible response codes returned by this method.
- *
- * @return The possible response codes returned by this method.
- */
- public Collection<Response> getResponses() {
- return responses.values();
- }
-
- /**
- * Sets the list of <code>Accept</code> header values that this method accepts if it's different
- * from the servlet.
- *
- * @param consumes The list of <code>Accept</code> header values.
- * @return This object (for method chaining).
- */
- public MethodDescription setConsumes(Collection<String> consumes) {
- this.consumes = consumes;
- return this;
- }
-
- /**
- * Returns the list of <code>Accept</code> header values that this method accepts if it's different
- * from the servlet.
- *
- * @return The list of <code>Accept</code> header values.
- */
- public Collection<String> getConsumes() {
- return consumes;
- }
-
- /**
- * Sets the list of <code>Content-Type</code> header values that this method accepts if it's different
- * from the servlet.
- *
- * @param produces The list of <code>Content-Type</code> header values.
- * @return This object (for method chaining).
- */
- public MethodDescription setProduces(Collection<String> produces) {
- this.produces = produces;
- return this;
- }
-
- /**
- * Returns the list of <code>Content-Type</code> header values that this method accepts if it's different
- * from the servlet.
- *
- * @return The list of <code>Content-Type</code> header values.
- */
- public Collection<String> getProduces() {
- return produces;
- }
- /**
- * Sets the guards field on this label to a new value.
- *
- * @param guards The guards associated with this method.
- * @return This object (for method chaining).
- */
- public MethodDescription setGuards(Class<?>...guards) {
- this.guards = new String[guards.length];
- for (int i = 0; i < guards.length; i++)
- this.guards[i] = guards[i].getSimpleName();
- return this;
- }
-
- /**
- * Returns the guards field on this label.
- *
- * @return The guards.
- */
- public String[] getGuards() {
- return guards;
- }
-
- /**
- * Sets the matchers field on this label to a new value.
- *
- * @param matchers The matchers associated with this method.
- * @return This object (for method chaining).
- */
- public MethodDescription setMatchers(Class<?>...matchers) {
- this.matchers = new String[matchers.length];
- for (int i = 0; i < matchers.length; i++)
- this.matchers[i] = matchers[i].getSimpleName();
- return this;
- }
-
- /**
- * Returns the matchers field on this label.
- *
- * @return The matchers.
- */
- public String[] getMatchers() {
- return matchers;
- }
-
- /**
- * Sets the converters field on this label to a new value.
- *
- * @param converters The converters associated with this method.
- * @return This object (for method chaining).
- */
- public MethodDescription setConverters(Class<?>...converters) {
- this.converters = new String[converters.length];
- for (int i = 0; i < converters.length; i++)
- this.converters[i] = converters[i].getSimpleName();
- return this;
- }
-
- /**
- * Returns the converters field on this label.
- *
- * @return The converters.
- */
- public String[] getConverters() {
- return converters;
- }
-
- /**
- * Add a request variable to this method description.
- *
- * @param category The variable category (e.g. <js>"attr"</js>, <js>"attr"</js>, <js>"header"</js>, <js>"content"</js>).
- * @param name The variable name.
- * Can be <jk>null</jk> in the case of <js>"content"</js> category.
- * @return The new variable whose fields can be modified.
- */
- public Var addRequestVar(String category, String name) {
- for (Var v : requestVars)
- if (v.matches(category, name))
- return v;
- Var v = new Var(category, name);
- requestVars.add(v);
- return v;
- }
-
- /**
- * Add a possible HTTP response code from this method.
- *
- * @param httpStatus The HTTP status code.
- * @return The new response object whose fields can be modified.
- */
- public Response addResponse(int httpStatus) {
- if (! responses.containsKey(httpStatus))
- responses.put(httpStatus, new Response(httpStatus));
- return responses.get(httpStatus);
- }
-
- @Override
- public int compareTo(MethodDescription md) {
- int i = Utils.compare(httpMethodOrder, md.httpMethodOrder);
- if (i == 0)
- i = path.compareTo(md.path);
- if (i == 0)
- i = javaMethod.compareTo(md.javaMethod);
- return i;
- }
-
- @SuppressWarnings("serial")
- private static final Map<String,Integer> httpMethodOrders = new HashMap<String,Integer>() {{
- put("GET", 1);
- put("PUT", 2);
- put("POST", 3);
- put("DELETE", 4);
- put("OPTIONS", 5);
- }};
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/NameDescription.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/NameDescription.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/NameDescription.java
deleted file mode 100755
index 6172995..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/NameDescription.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import org.apache.juneau.annotation.*;
-
-/**
- * Simple bean with {@code name} and {@code description} properties.
- * <p>
- * Primarily used for constructing tables with name/description columns on REST OPTIONS requests.
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-@Bean(properties={"name","description"})
-public class NameDescription {
-
- private Object name;
- private Object description;
-
- /** No-arg constructor. Used for JUnit testing of OPTIONS pages. */
- public NameDescription() {}
-
- /**
- * Constructor.
- * @param name A name.
- * @param description A description.
- */
- public NameDescription(Object name, Object description) {
- this.name = name;
- this.description = description;
- }
-
- /**
- * Returns the name field on this label.
- * @return The name.
- */
- public Object getName() {
- return name;
- }
-
- /**
- * Sets the name field on this label to a new value.
- * @param name The new name.
- */
- public void setName(Object name) {
- this.name = name;
- }
-
- /**
- * Returns the description field on this label.
- * @return The description.
- */
- public Object getDescription() {
- return description;
- }
-
- /**
- * Sets the description field on this label to a new value.
- * @param description The new description.
- */
- public void setDescription(Object description) {
- this.description = description;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ParamDescription.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ParamDescription.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ParamDescription.java
deleted file mode 100755
index f87d08b..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ParamDescription.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import org.apache.juneau.annotation.*;
-
-/**
- * Simple bean for describing GET parameters.
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-@Bean(properties={"name","dataType","description"})
-public final class ParamDescription {
- private String name;
- private String dataType;
- private String description;
-
- /** No-arg constructor. Used for JUnit testing of OPTIONS pages. */
- public ParamDescription() {}
-
- /**
- * Constructor.
- *
- * @param name A name.
- * @param dataType Typically a fully-qualified class name.
- * @param description A description.
- */
- public ParamDescription(String name, String dataType, String description) {
- this.name = name;
- this.dataType = dataType;
- this.description = description;
- }
-
- /**
- * Returns the name field on this label.
- *
- * @return The name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the name field on this label to a new value.
- *
- * @param name The new name.
- * @return This object (for method chaining).
- */
- public ParamDescription setName(String name) {
- this.name = name;
- return this;
- }
-
- /**
- * Returns the dataType field on this label.
- *
- * @return The dataType.
- */
- public String getDataType() {
- return dataType;
- }
-
- /**
- * Sets the dataType field on this label to a new value.
- *
- * @param dataType The new data type.
- * @return This object (for method chaining).
- */
- public ParamDescription setDataType(String dataType) {
- this.dataType = dataType;
- return this;
- }
-
- /**
- * Returns the description field on this label.
- *
- * @return The description.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets the description field on this label to a new value.
- *
- * @param description The new description.
- * @return This object (for method chaining).
- */
- public ParamDescription setDescription(String description) {
- this.description = description;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceDescription.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceDescription.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceDescription.java
deleted file mode 100755
index 312fa3c..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceDescription.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import org.apache.juneau.dto.*;
-import org.apache.juneau.server.*;
-
-/**
- * Shortcut label for child resources. Typically used in router resources.
- *
- * <h6 class='topic'>Examples</h6>
- * <p class='bcode'>
- * <jc>// Instead of this...</jc>
- * <jk>new</jk> NameDescription(<jk>new</jk> Link(<js>"httpTool"</js>, uri + <js>"/httpTool"</js>), <js>"HTTP request test client"</js>);
- *
- * <jc>// ...use this simpler equivalent...</jc>
- * <jk>new</jk> ResourceLink(uri, <js>"httpTool"</js>, <js>"HTTP request test client"</js>);
- * </p>
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-public final class ResourceDescription extends NameDescription implements Comparable<ResourceDescription> {
-
- /**
- * Constructor.
- *
- * @param rootUrl The root URI of the child resource (e.g. the URI of the parent resource).
- * Must not end with <js>'/'</js>.
- * Must be URL-Encoded.
- * @param name The name of the child resource.
- * This will be URL-encoded and appended onto the root URL to create the hyperlink for the resource.
- * @param description The description of the child resource.
- */
- public ResourceDescription(String rootUrl, String name, String description) {
- super(new Link(name, (rootUrl.equals("/") || rootUrl.isEmpty() ? "/" : rootUrl + "/") + RestUtils.encode(name)), description);
- }
-
- /**
- * Constructor for resources that are children of a REST resource.
- *
- * @param req The HTTP request.
- * @param childPath The childPath The path of the child resource relative to the servlet.
- * @param description The description of the child resource.
- */
- public ResourceDescription(RestRequest req, String childPath, String description) {
- super(new Link(calcName(childPath), calcHref(req, childPath)), description);
- }
-
- private static String calcName(String childPath) {
- return RestUtils.decode(childPath.indexOf('/') == -1 ? childPath : childPath.substring(childPath.lastIndexOf('/')+1));
- }
-
- private static String calcHref(RestRequest req, String childPath) {
- return req.getServletURIBuilder().append('/').append(childPath).toString();
- }
-
- /**
- * Constructor.
- *
- * @param name The name of the child resource.
- * @param description The description of the child resource.
- */
- public ResourceDescription(String name, String description) {
- super(new Link(name, name), description);
- }
-
- /** No-arg constructor. Used for JUnit testing of OPTIONS pages. */
- public ResourceDescription() {}
-
- @Override /* NameDescription */
- public Link getName() {
- return (Link)super.getName();
- }
-
- /**
- * Overridden setter.
- *
- * @param name The new name.
- */
- public void setName(Link name) {
- super.setName(name);
- }
-
- @Override /* Comparable */
- public int compareTo(ResourceDescription o) {
- return getName().compareTo(o.getName());
- }
-
- @Override /* Object */
- public boolean equals(Object o) {
- return (o instanceof ResourceDescription) && ((ResourceDescription)o).getName().equals(getName());
- }
-
- @Override /* Object */
- public int hashCode() {
- return getName().hashCode();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceLink.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceLink.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceLink.java
deleted file mode 100755
index 19376c4..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceLink.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import java.text.*;
-
-import org.apache.juneau.dto.*;
-import org.apache.juneau.server.*;
-
-/**
- * A simple link to a child of a parent resource.
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-public class ResourceLink extends Link {
-
- /**
- * Constructor.
- *
- * @param req The HTTP request from the parent resource.
- * @param childPath The child resource path.
- * @param args Optional {@link MessageFormat}-style arguments in the child path.
- */
- public ResourceLink(RestRequest req, String childPath, Object...args) {
- super(getName(getPath(childPath,args)), getHref(req, getPath(childPath,args)));
- }
-
- /**
- * Constructor.
- *
- * @param label The label for the link.
- * @param req The HTTP request from the parent resource.
- * @param childPath The child resource path.
- * @param args Optional {@link MessageFormat}-style arguments in the child path.
- */
- public ResourceLink(String label, RestRequest req, String childPath, Object...args) {
- super(label, getHref(req, getPath(childPath,args)));
- }
-
- private static String getName(String childPath) {
- String s = childPath;
- if (childPath.indexOf('/') == -1)
- s = childPath;
- else
- s = childPath.substring(childPath.lastIndexOf('/')+1);
- return RestUtils.decode(s);
- }
-
- private static String getHref(RestRequest req, String childPath) {
- return req.getServletURIBuilder().append('/').append(childPath).toString();
- }
-
- private static String getPath(String childPath, Object...args) {
- if (args.length > 0)
- childPath = MessageFormat.format(childPath, args);
- return childPath;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceOptions.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceOptions.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceOptions.java
deleted file mode 100755
index ef46926..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/ResourceOptions.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import static javax.servlet.http.HttpServletResponse.*;
-
-import java.util.*;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.server.*;
-import org.apache.juneau.server.annotation.*;
-
-/**
- * Default POJO bean used for generating OPTIONS page results.
- * <p>
- * @author James Bognar (james.bognar@salesforce.com)
- */
-@Bean(properties={"label","description","className","methods","children","consumes","produces","guards","transforms","converters"})
-public class ResourceOptions {
- private String label, description;
- private String className;
- private Collection<MethodDescription> methods;
- private ChildResourceDescriptions children;
- private Collection<String> consumes, produces;
- private Collection<String> guards;
- private Collection<String> transforms;
- private Collection<String> converters;
-
- /**
- * Constructor.
- * @param servlet The servlet that this bean describes.
- * @param req The HTTP servlet request.
- */
- public ResourceOptions(RestServlet servlet, RestRequest req) {
- try {
- setClassName(servlet.getClass().getName());
- setLabel(servlet.getLabel(req));
- setDescription(servlet.getDescription(req));
- setMethods(servlet.getMethodDescriptions(req));
- setConsumes(servlet.getSupportedAcceptTypes());
- setProduces(servlet.getSupportedContentTypes());
- setChildren(new ChildResourceDescriptions(servlet, req));
- setGuards(servlet.getGuards());
- setTransforms(servlet.getTransforms());
- setConverters(servlet.getConverters());
- } catch (RestServletException e) {
- throw new RestException(SC_INTERNAL_SERVER_ERROR, e);
- }
- }
-
- /**
- * Bean constructor.
- */
- public ResourceOptions() {}
-
- /**
- * Returns the label of the REST resource.
- * @return The current bean property value.
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * Sets the label of the REST resource.
- * @param label The new bean property value.
- * @return This object (for method chaining).
- */
- public ResourceOptions setLabel(String label) {
- this.label = label;
- return this;
- }
-
- /**
- * Returns the description of the REST resource.
- * @return The current bean property value.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets the description of the REST resource.
- * @param description The new bean property value.
- * @return This object (for method chaining).
- */
- public ResourceOptions setDescription(String description) {
- this.description = description;
- return this;
- }
-
- /**
- * Returns the class name of the REST resource.
- * @return The current bean property value.
- */
- public String getClassName() {
- return className;
- }
-
- /**
- * Sets the class name of the REST resource.
- * @param className The new bean property value.
- * @return This object (for method chaining).
- */
- public ResourceOptions setClassName(String className) {
- this.className = className;
- return this;
- }
-
- /**
- * Returns the methods provided on this REST resource.
- * @return The current bean property value.
- */
- public Collection<MethodDescription> getMethods() {
- return methods;
- }
-
- /**
- * Sets the methods provided on this REST resource.
- * @param methods The new bean property value.
- * @return This object (for method chaining).
- */
- public ResourceOptions setMethods(Collection<MethodDescription> methods) {
- List<MethodDescription> l = new ArrayList<MethodDescription>(methods);
- Collections.sort(l);
- this.methods = l;
- return this;
- }
-
- /**
- * Returns the list of allowable <code>Accept</code> header values on requests.
- * @return The current bean property value.
- */
- public Collection<String> getConsumes() {
- return consumes;
- }
-
- /**
- * Sets the list of allowable <code>Accept</code> header values on requests.
- * @param consumes The new bean property value.
- * @return This object (for method chaining).
- */
- public ResourceOptions setConsumes(Collection<String> consumes) {
- this.consumes = consumes;
- return this;
- }
-
- /**
- * Returns the list of allowable <code>Content-Type</code> header values on requests.
- * @return The current bean property value.
- */
- public Collection<String> getProduces() {
- return produces;
- }
-
- /**
- * Sets the list of allowable <code>Content-Type</code> header values on requests.
- * @param produces The new bean property value.
- * @return This object (for method chaining).
- */
- public ResourceOptions setProduces(Collection<String> produces) {
- this.produces = produces;
- return this;
- }
-
- /**
- * Returns the description of child resources with this resource (typically through {@link RestResource#children()} annotation).
- * @return The description of child resources of this resource.
- */
- public ChildResourceDescriptions getChildren() {
- return children;
- }
-
- /**
- * Sets the child resource descriptions associated with this resource.
- * @param children The child resource descriptions.
- * @return This object (for method chaining).
- */
- public ResourceOptions setChildren(ChildResourceDescriptions children) {
- this.children = children;
- return this;
- }
-
-
- /**
- * Returns the list of class-wide guards associated with this resource (typically through {@link RestResource#guards()} annotation).
- * @return The simple class names of the guards.
- */
- public Collection<String> getGuards() {
- return guards;
- }
-
- /**
- * Sets the simple class names of the guards associated with this resource.
- * @param guards The simple class names of the guards.
- * @return This object (for method chaining).
- */
- public ResourceOptions setGuards(Collection<String> guards) {
- this.guards = guards;
- return this;
- }
-
- /**
- * Shortcut for calling {@link #setGuards(Collection)} from {@link RestGuard} instances.
- * @param guards Instances of guards associated with this resource.
- * @return This object (for method chaining).
- */
- public ResourceOptions setGuards(RestGuard[] guards) {
- Collection<String> l = new ArrayList<String>(guards.length);
- for (RestGuard g : guards)
- l.add(g.getClass().getSimpleName());
- return setGuards(l);
- }
-
- /**
- * Returns the list of class-wide transforms associated with this resource (typically through {@link RestResource#transforms()} annotation).
- * @return The simple class names of the transforms.
- */
- public Collection<String> getTransforms() {
- return transforms;
- }
-
- /**
- * Sets the simple class names of the transforms associated with this resource.
- * @param transforms The simple class names of the transforms.
- * @return This object (for method chaining).
- */
- public ResourceOptions setTransforms(Collection<String> transforms) {
- this.transforms = transforms;
- return this;
- }
-
- /**
- * Shortcut for calling {@link #setTransforms(Collection)} from {@link Class} instances.
- * @param transforms Transform classes associated with this resource.
- * @return This object (for method chaining).
- */
- public ResourceOptions setTransforms(Class<?>[] transforms) {
- Collection<String> l = new ArrayList<String>(transforms.length);
- for (Class<?> c : transforms)
- l.add(c.getSimpleName());
- return setTransforms(l);
- }
-
- /**
- * Returns the list of class-wide converters associated with this resource (typically through {@link RestResource#converters()} annotation).
- * @return The simple class names of the converters.
- */
- public Collection<String> getConverters() {
- return converters;
- }
-
- /**
- * Sets the simple class names of the converters associated with this resource.
- * @param converters The simple class names of the converters.
- * @return This object (for method chaining).
- */
- public ResourceOptions setConverters(Collection<String> converters) {
- this.converters = converters;
- return this;
- }
-
- /**
- * Shortcut for calling {@link #setConverters(Collection)} from {@link RestConverter} instances.
- * @param converters Converter classes associated with this resource.
- * @return This object (for method chaining).
- */
- public ResourceOptions setConverters(RestConverter[] converters) {
- Collection<String> l = new ArrayList<String>(converters.length);
- for (RestConverter c : converters)
- l.add(c.getClass().getSimpleName());
- return setConverters(l);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/Var.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/Var.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/Var.java
deleted file mode 100755
index 1f5b274..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/Var.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.labels;
-
-import org.apache.juneau.annotation.*;
-import org.apache.juneau.internal.*;
-
-/**
- * A request or response variable.
- */
-@Bean(properties={"category","name","description"})
-public class Var implements Comparable<Var> {
-
- /** Variable category (e.g. <js>"header"</js>, <js>"content"</js>) */
- public String category;
-
- /** Variable name (e.g. <js>"Content-Type"</js>) */
- public String name;
-
- /** Variable description */
- public String description;
-
- /** Bean constructor */
- public Var() {}
-
- /**
- *
- * Constructor.
- * @param category Variable category (e.g. "ATTR", "PARAM").
- * @param name Variable name.
- */
- public Var(String category, String name) {
- this.category = category;
- this.name = name;
- }
-
- @SuppressWarnings("hiding")
- boolean matches(String category, String name) {
- if (this.category.equals(category))
- if (name == null || name.equals(this.name))
- return true;
- return false;
- }
-
- /**
- * Sets the description for this variable.
- *
- * @param description The new description.
- * @return This object (for method chaining).
- */
- public Var setDescription(String description) {
- this.description = description;
- return this;
- }
-
- @Override /* Comparable */
- public int compareTo(Var o) {
- int i = category.compareTo(o.category);
- if (i == 0)
- i = (name == null ? -1 : name.compareTo(o.name));
- return i;
- }
-
- @Override /* Object */
- public boolean equals(Object o) {
- if (o instanceof Var) {
- Var v = (Var)o;
- return (v.category.equals(category) && StringUtils.isEquals(name, v.name));
- }
- return false;
- }
-
- @Override /* Object */
- public int hashCode() {
- return category.hashCode() + (name == null ? 0 : name.hashCode());
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/nls/DefaultLabels.properties
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/nls/DefaultLabels.properties b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/nls/DefaultLabels.properties
deleted file mode 100755
index 82c4da4..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/nls/DefaultLabels.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-# ***************************************************************************************************************************
-# * 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. *
-# * *
-# ***************************************************************************************************************************
-# NLS_ENCODING=UTF-8
-# NLS_MESSAGEFORMAT_VAR
-
-QueryableParam.q.type = Map<String,String>
-QueryableParam.q.desc = Query parameter.\nUse to return rows that match a specified search string.\nExample:&q={name:'Bill*',birthDate:'>2000'}.\nSee DateMatcher for syntax of search parameters on objects of type Date and Calendar.\nSee NumberMatcher for syntax of search parameters on objects of type Number.\nSee StringMatcher for syntax of search parameters on objects of all other types.
-QueryableParam.v.type = List<String> or String (comma-delimited list)
-QueryableParam.v.desc = View parameter.\nUse to return a specified set of columns.\nExample: &v=['name','birthDate']
-QueryableParam.s.type = Map<String,Character>
-QueryableParam.s.desc = Sort parameter.\nUse to sort results by the specified columns.\nThe JSON object keys are the column names, and the values are either 'A' for ascending or 'D' for descending.\nExample: &s={name:'A',birthDate:'D'}
-QueryableParam.g.type = List<String> or String (comma-delimited-list)
-QueryableParam.g.desc = Group-by parameter.\nUse to perform a group-by rollup on the specified columns.\nEssentially, this returns the specified list of columns, plus an additional 'count' column showing the grouped results.\nThis is very similar to the group-by functionality in SQL.
-QueryableParam.i.type = boolean
-QueryableParam.i.desc = Case-insensitive parameter.\nUse for case-insensitive matching on the &q parameter.
-QueryableParam.p.type = int
-QueryableParam.p.desc = Position parameter.\nUse to only return rows at the specified index position (zero-indexed).
-QueryableParam.l.type = int
-QueryableParam.l.desc = Limit parameter.\nUse to only return the specified number of rows.\n0 returns all rows.
-
-HeaderParam.accept.type = String
-HeaderParam.accept.desc = Specify the HTTP Accept header (e.g. &accept=text/xml).
-HeaderParam.accept-encoding.type = String
-HeaderParam.accept-encoding.desc = Specify the HTTP Accept-Encoding header (e.g. &accept-encoding=SJIS).
-HeaderParam.method.type = String
-HeaderParam.method.desc = Override the HTTP method (e.g. &method=HEAD).\nThis can also be used to invoke non-HTTP-standard methods.
-HeaderParam.content.type = *
-HeaderParam.content.desc = Can be used to pass in content for PUT/POST methods.\nTypically the content will be a JSON object or array.
-HeaderParam.plainText.type = Boolean
-HeaderParam.plainText.desc = Forces the response Content-Type to be 'text/plain' regardless of what's specified on the Accept header.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/package.html
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/package.html b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/package.html
deleted file mode 100755
index 4e03390..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/labels/package.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * 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.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <style type="text/css">
- /* For viewing in Page Designer */
- @IMPORT url("../../../../javadoc.css");
-
- /* For viewing in REST interface */
- @IMPORT url("../htdocs/javadoc.css");
- body {
- margin: 20px;
- }
- </style>
- <script>
- /* Replace all @code and @link tags. */
- window.onload = function() {
- document.body.innerHTML = document.body.innerHTML.replace(/\{\@code ([^\}]+)\}/g, '<code>$1</code>');
- document.body.innerHTML = document.body.innerHTML.replace(/\{\@link (([^\}]+)\.)?([^\.\}]+)\}/g, '<code>$3</code>');
- }
- </script>
-</head>
-<body>
-<p>Various REST interface label classes</p>
-</body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/MultipartFormDataMatcher.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/MultipartFormDataMatcher.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/MultipartFormDataMatcher.java
deleted file mode 100755
index d2583f0..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/MultipartFormDataMatcher.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.matchers;
-
-import org.apache.juneau.server.*;
-
-/**
- * Predefined matcher for matching requests with content type <js>"multipart/form-data"</js>.
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-public class MultipartFormDataMatcher extends RestMatcher {
- @Override /* RestMatcher */
- public boolean matches(RestRequest req) {
- String contentType = req.getContentType();
- return contentType != null && contentType.startsWith("multipart/form-data"); //$NON-NLS-1$
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/UrlEncodedFormMatcher.java
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/UrlEncodedFormMatcher.java b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/UrlEncodedFormMatcher.java
deleted file mode 100755
index 8b4f1de..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/UrlEncodedFormMatcher.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************************************
- * 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.server.matchers;
-
-import org.apache.juneau.server.*;
-
-/**
- * Predefined matcher for matching requests with content type <js>"application/x-www-form-urlencoded"</js>.
- *
- * @author James Bognar (james.bognar@salesforce.com)
- */
-public class UrlEncodedFormMatcher extends RestMatcher {
- @Override /* RestMatcher */
- public boolean matches(RestRequest req) {
- String contentType = req.getContentType();
- return contentType != null && contentType.equals("application/x-www-form-urlencoded"); //$NON-NLS-1$
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2c3a7cb5/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/package.html
----------------------------------------------------------------------
diff --git a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/package.html b/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/package.html
deleted file mode 100755
index 7eacf3a..0000000
--- a/com.ibm.team.juno.server/src/main/java/org/apache/juneau/server/matchers/package.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML>
-<!--
-/***************************************************************************************************************************
- * 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.
- *
- ***************************************************************************************************************************/
- -->
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <style type="text/css">
- /* For viewing in Page Designer */
- @IMPORT url("../../../../../javadoc.css");
-
- /* For viewing in REST interface */
- @IMPORT url("../htdocs/javadoc.css");
- body {
- margin: 20px;
- }
- </style>
-</head>
-<body>
-<p>Predefined Matchers</p>
-</body>
-</html>
\ No newline at end of file