Author: ppoddar
Date: Sun Nov 21 16:01:07 2010
New Revision: 1037487
URL: http://svn.apache.org/viewvc?rev=1037487&view=rev
Log:
OPENJPA-1851: Organize MIME type
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
Sun Nov 21 16:01:07 2010
@@ -86,7 +86,7 @@ abstract class AbstractCommand implement
return has(key, _qualifiers);
}
- public boolean isBooleanQualifier(String key) {
+ protected boolean isBooleanQualifier(String key) {
return "true".equals(getQualifier(key));
}
@@ -213,12 +213,12 @@ abstract class AbstractCommand implement
return _formatter;
}
- public OpenJPAStateManager toStateManager(OpenJPAEntityManager em, Object
obj) {
+ protected OpenJPAStateManager toStateManager(OpenJPAEntityManager em,
Object obj) {
StoreContext broker = ((StoreContext)JPAFacadeHelper.toBroker(em));
return broker.getStateManager(obj);
}
- public List<OpenJPAStateManager> toStateManager(OpenJPAEntityManager em,
Collection<?> objects) {
+ protected List<OpenJPAStateManager> toStateManager(OpenJPAEntityManager
em, Collection<?> objects) {
StoreContext broker = ((StoreContext)JPAFacadeHelper.toBroker(em));
List<OpenJPAStateManager> sms = new ArrayList<OpenJPAStateManager>();
for (Object o : objects) {
@@ -229,7 +229,7 @@ abstract class AbstractCommand implement
- public void debug(HttpServletRequest request, HttpServletResponse
response, JPAServletContext ctx)
+ protected void debug(HttpServletRequest request, HttpServletResponse
response, JPAServletContext ctx)
throws IOException {
response.setContentType("text/plain");
PrintWriter writer = response.getWriter();
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java
Sun Nov 21 16:01:07 2010
@@ -34,7 +34,6 @@ import static org.apache.openjpa.persist
*
*/
public class DojoFormatter extends XMLFormatter {
- public static final String MIME_TYPE = "text/html";
public static final String DOJO_URL =
"http://ajax.googleapis.com/ajax/libs/dojo/1.5/dojo/dojo.xd.js";;
public static final String DOJO_CSS_URL =
"http://ajax.googleapis.com/ajax/libs/dojo/1.5/dijit/themes/";;
public static final String DOJO_THEME = "claro";
@@ -64,7 +63,7 @@ public class DojoFormatter extends XMLFo
@Override
public String getMimeType() {
- return MIME_TYPE;
+ return MIME_TYPE_HTML;
}
@Override
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
Sun Nov 21 16:01:07 2010
@@ -42,7 +42,7 @@ import org.w3c.dom.Element;
* @author Pinaki Poddar
*
*/
-public class DomainCommand extends AbstractCommand {
+class DomainCommand extends AbstractCommand {
/**
* The element/attribute tags declared in <code>jest-instance.xsd</code>
XML schema.
*/
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
Sun Nov 21 16:01:07 2010
@@ -38,7 +38,7 @@ import org.apache.openjpa.util.Applicati
* @author Pinaki Poddar
*
*/
-public class FindCommand extends AbstractCommand {
+class FindCommand extends AbstractCommand {
private static final List<String> _mandatoryArgs = Arrays.asList("type");
private static final List<String> _validQualifiers =
Arrays.asList("format", "plan");
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
Sun Nov 21 16:01:07 2010
@@ -24,23 +24,17 @@ import static java.net.HttpURLConnection
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.ArrayList;
import java.util.Calendar;
-import java.util.Collection;
import java.util.Date;
-import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.openjpa.conf.OpenJPAConfiguration;
-import org.apache.openjpa.kernel.OpenJPAStateManager;
-import org.apache.openjpa.kernel.StoreContext;
import org.apache.openjpa.lib.log.Log;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.meta.ClassMetaData;
import org.apache.openjpa.meta.MetaDataRepository;
-import org.apache.openjpa.persistence.JPAFacadeHelper;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
Sun Nov 21 16:01:07 2010
@@ -57,10 +57,8 @@ import org.apache.openjpa.persistence.me
*/
public class JSONObjectFormatter implements ObjectFormatter {
- public static final String MIME_TYPE = "application/json";
-
public String getMimeType() {
- return MIME_TYPE;
+ return MIME_TYPE_JSON;
}
public void encode(Object obj, JPAServletContext ctx) {
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
Sun Nov 21 16:01:07 2010
@@ -33,6 +33,9 @@ import org.apache.openjpa.lib.util.Local
*/
public interface ObjectFormatter {
public static final Localizer _loc =
Localizer.forPackage(ObjectFormatter.class);
+ public static final String MIME_TYPE_HTML = "text/html";
+ public static final String MIME_TYPE_XML = "text/xml";
+ public static final String MIME_TYPE_JSON = "application/json";
/**
* Gets the mime type produced by this formatter.
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
Sun Nov 21 16:01:07 2010
@@ -32,6 +32,8 @@ import org.apache.openjpa.lib.util.Local
/**
+ * Represents configuration properties in HTML.
+ *
* @author Pinaki Poddar
*
*/
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
Sun Nov 21 16:01:07 2010
@@ -29,18 +29,16 @@ import javax.persistence.EntityManager;
import javax.persistence.Query;
/**
+ * Executes query.
+ *
* @author Pinaki Poddar
*
*/
-public class QueryCommand extends AbstractCommand {
+class QueryCommand extends AbstractCommand {
private static final List<String> _mandatoryArgs = Arrays.asList("q");
private static final List<String> _validQualifiers =
Arrays.asList("format", "plan", "named", "single",
"first", "max");
- public String getAction() {
- return "query";
- }
-
@Override
protected Collection<String> getMandatoryArguments() {
return _mandatoryArgs;
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java?rev=1037487&r1=1037486&r2=1037487&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
Sun Nov 21 16:01:07 2010
@@ -88,7 +88,6 @@ import org.w3c.dom.Element;
*
*/
public class XMLFormatter implements ObjectFormatter {
- public static final String MIME_TYPE = "text/xml";
/**
* The element/attribute tags declared in <code>jest-instance.xsd</code>
XML schema.
*/
@@ -123,13 +122,9 @@ public class XMLFormatter implements Obj
}
}
-
- /**
- * Gets the content type of the response.
- */
public String getMimeType() {
- return MIME_TYPE;
- }
+ return MIME_TYPE_XML;
+ }
@Override
public void encode(Object obj, JPAServletContext ctx) throws IOException {
