You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/01/22 09:05:57 UTC
svn commit: r1234460 [11/30] - in /incubator/isis/trunk/framework/viewer:
bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/
bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/
bdd/common/src/main/java/org/apache/isis/viewer...
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java Sun Jan 22 08:05:17 2012
@@ -24,14 +24,11 @@ import java.io.PrintWriter;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
import org.apache.isis.viewer.html.component.Page;
import org.apache.isis.viewer.html.component.html.HtmlComponentFactory;
import org.apache.isis.viewer.html.context.Context;
@@ -41,7 +38,7 @@ import org.apache.isis.viewer.html.servl
import org.apache.log4j.Logger;
public class ControllerServlet extends AbstractHtmlViewerServlet {
-
+
private static final long serialVersionUID = 1L;
private static final Logger LOG = Logger.getLogger(ControllerServlet.class);
@@ -71,20 +68,17 @@ public class ControllerServlet extends A
// //////////////////////////////////////////////////////////////////
@Override
- protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
- throws ServletException, IOException {
+ protected void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
request.setCharacterEncoding(encoding);
processRequest(request, response);
}
@Override
- protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException,
- IOException {
+ protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
processRequest(request, response);
}
- private void processRequest(final HttpServletRequest request, final HttpServletResponse response)
- throws ServletException, IOException {
+ private void processRequest(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
LOG.info("request: " + request.getServletPath() + "?" + request.getQueryString());
final Request req = new ServletRequest(request);
@@ -106,8 +100,7 @@ public class ControllerServlet extends A
private Context getContextForRequest(final HttpServletRequest request) {
final AuthenticationSession authenticationSession = getAuthenticationSession();
- Context context =
- (Context) authenticationSession.getAttribute(HtmlServletConstants.AUTHENTICATION_SESSION_CONTEXT_KEY);
+ Context context = (Context) authenticationSession.getAttribute(HtmlServletConstants.AUTHENTICATION_SESSION_CONTEXT_KEY);
if (context == null || !context.isValid()) {
// TODO reuse the component factory
context = new Context(getNewHtmlComponentFactory());
@@ -120,8 +113,7 @@ public class ControllerServlet extends A
return new HtmlComponentFactory(getPathBuilder());
}
- private void processRequest(final HttpServletRequest request, final HttpServletResponse response,
- final Request req, final Context context) throws IOException, ServletException {
+ private void processRequest(final HttpServletRequest request, final HttpServletResponse response, final Request req, final Context context) throws IOException, ServletException {
response.setContentType("text/html");
// no need to check if logged in; the IsisSessionFilter would
@@ -163,5 +155,4 @@ public class ControllerServlet extends A
page.addDebug("Path info", request.getPathInfo());
}
-
}
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java Sun Jan 22 08:05:17 2012
@@ -42,7 +42,6 @@ public final class HtmlServletConstants
public static final String LOGON_PAGE = "logon";
static final String START_PAGE = "start";
-
private HtmlServletConstants() {
}
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java Sun Jan 22 08:05:17 2012
@@ -53,18 +53,15 @@ public class LogonServlet extends Abstra
}
@Override
- protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException,
- IOException {
+ protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
@Override
- protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
- throws ServletException, IOException {
+ protected void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
// look for existing valid session
- AuthenticationSession existingAuthSession =
- authenticationSessionStrategy.lookupValid(request, response);
+ final AuthenticationSession existingAuthSession = authenticationSessionStrategy.lookupValid(request, response);
if (existingAuthSession != null) {
redirectToStartPage(response, existingAuthSession.getUserName());
return;
@@ -105,11 +102,10 @@ public class LogonServlet extends Abstra
response.sendRedirect(pathTo(HtmlServletConstants.START_PAGE));
}
- private void renderPrompt(final HttpServletResponse response, final String user, final String password,
- final String error) throws IOException {
+ private void renderPrompt(final HttpServletResponse response, final String user, final String password, final String error) throws IOException {
response.setContentType("text/html");
final HtmlComponentFactory factory = getHtmlComponentFactory();
- boolean registerLink = getAuthenticationManager().supportsRegistration(RegistrationDetailsPassword.class);
+ final boolean registerLink = getAuthenticationManager().supportsRegistration(RegistrationDetailsPassword.class);
final LogonFormPage page = factory.createLogonPage(user, password, registerLink, error);
page.write(response.getWriter());
}
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/RegisterServlet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/RegisterServlet.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/RegisterServlet.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/RegisterServlet.java Sun Jan 22 08:05:17 2012
@@ -34,25 +34,23 @@ import org.apache.log4j.Logger;
import com.google.common.base.Objects;
public class RegisterServlet extends AbstractHtmlViewerServlet {
-
+
private static final long serialVersionUID = 1L;
-
+
@SuppressWarnings("unused")
private static final Logger LOG = Logger.getLogger(RegisterServlet.class);
-
+
@Override
public void init() throws ServletException {
}
@Override
- protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException,
- IOException {
+ protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
@Override
- protected void doPost(final HttpServletRequest request, final HttpServletResponse response)
- throws ServletException, IOException {
+ protected void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
// prompt
final String user = request.getParameter("username");
@@ -85,10 +83,7 @@ public class RegisterServlet extends Abs
response.sendRedirect(pathTo(HtmlServletConstants.LOGON_PAGE));
}
- private void renderPrompt(
- final HttpServletResponse response,
- final String user, final String password, final String password2,
- final String message) throws IOException {
+ private void renderPrompt(final HttpServletResponse response, final String user, final String password, final String password2, final String message) throws IOException {
response.setContentType("text/html");
final HtmlComponentFactory factory = new HtmlComponentFactory(getPathBuilder());
final RegisterFormPage page = factory.createRegisterPage(user, password, message);
@@ -99,5 +94,4 @@ public class RegisterServlet extends Abs
return getAuthenticationManager().register(new RegistrationDetailsPassword(user, password));
}
-
}
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java Sun Jan 22 08:05:17 2012
@@ -24,8 +24,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
-
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
@@ -68,14 +66,14 @@ import org.apache.isis.viewer.html.reque
import org.apache.isis.viewer.html.task.InvokeMethod;
import org.apache.isis.viewer.html.task.TaskLookupException;
import org.apache.isis.viewer.html.task.TaskStep;
+import org.apache.log4j.Logger;
public class WebController {
private static final Logger LOG = Logger.getLogger(WebController.class);
private static final Logger ACCESS_LOG = Logger.getLogger("access_log");
- private static final String ERROR_REASON = "This error occurs when you go back to a page "
- + "using the browsers back button. To avoid this error in the future please avoid using the back button";
+ private static final String ERROR_REASON = "This error occurs when you go back to a page " + "using the browsers back button. To avoid this error in the future please avoid using the back button";
protected class DebugView implements Action {
public DebugView() {
@@ -212,7 +210,7 @@ public class WebController {
private boolean isDebug;
private final PathBuilder pathBuilder;
- public WebController(PathBuilder pathBuilder) {
+ public WebController(final PathBuilder pathBuilder) {
this.pathBuilder = pathBuilder;
}
@@ -286,7 +284,8 @@ public class WebController {
runAction(context, request, page);
addCrumbs(context, page);
- // The web viewer has no views of other objects, so changes can be ignored
+ // The web viewer has no views of other objects, so changes can be
+ // ignored
if (IsisContext.inSession() && IsisContext.inTransaction()) {
IsisContext.getUpdateNotifier().clear();
}
@@ -316,7 +315,8 @@ public class WebController {
addAction(new AddItemToCollection());
addAction(new ChangeContext());
- // TODO allow these to be exclude by configuration so they cannot be run in a real system
+ // TODO allow these to be exclude by configuration so they cannot be run
+ // in a real system
addAction(new DebugOn(this));
addAction(new DebugOff(this));
@@ -351,8 +351,7 @@ public class WebController {
navigationBar.add(taskBar);
}
- private Component createServiceComponent(final Context context, final String serviceMapId,
- final ObjectAdapter serviceNO) {
+ private Component createServiceComponent(final Context context, final String serviceMapId, final ObjectAdapter serviceNO) {
final String serviceName = serviceNO.titleString();
final String serviceIcon = serviceNO.getIconName();
return context.getComponentFactory().createService(serviceMapId, serviceName, serviceIcon);
@@ -381,12 +380,10 @@ public class WebController {
try {
action.execute(r, context, page);
} catch (final ObjectLookupException e) {
- final String error =
- "The object/service you selected has timed out. Please navigate to the object via the history bar.";
+ final String error = "The object/service you selected has timed out. Please navigate to the object via the history bar.";
displayError(context, page, error);
} catch (final TaskLookupException e) {
- final String error =
- "The task you went back to has already been completed or cancelled. Please start the task again.";
+ final String error = "The task you went back to has already been completed or cancelled. Please start the task again.";
displayError(context, page, error);
}
r = r.getForward();
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java Sun Jan 22 08:05:17 2012
@@ -43,9 +43,7 @@ import org.apache.isis.viewer.html.conte
public class EditTask extends Task {
private static int size(final ObjectAdapter object) {
- final List<ObjectAssociation> fields =
- object.getSpecification().getAssociations(
- ObjectAssociationFilters.dynamicallyVisible(getAuthenticationSession(), object));
+ final List<ObjectAssociation> fields = object.getSpecification().getAssociations(ObjectAssociationFilters.dynamicallyVisible(getAuthenticationSession(), object));
return fields.size();
}
@@ -59,9 +57,7 @@ public class EditTask extends Task {
public EditTask(final Context context, final ObjectAdapter object) {
super(context, "Edit", "", object, size(object));
- final List<ObjectAssociation> allFields =
- object.getSpecification().getAssociations(
- ObjectAssociationFilters.dynamicallyVisible(getAuthenticationSession(), object));
+ final List<ObjectAssociation> allFields = object.getSpecification().getAssociations(ObjectAssociationFilters.dynamicallyVisible(getAuthenticationSession(), object));
fields = new ObjectAssociation[names.length];
for (int i = 0, j = 0; j < allFields.size(); j++) {
@@ -149,9 +145,7 @@ public class EditTask extends Task {
final ObjectAdapter[] entryAdapters = getEntries(context);
if (targetAdapter.isTransient()) {
- final ObjectAction action =
- targetAdapter.getSpecification().getObjectAction(ActionType.USER, "save",
- ObjectSpecification.EMPTY_LIST);
+ final ObjectAction action = targetAdapter.getSpecification().getObjectAction(ActionType.USER, "save", ObjectSpecification.EMPTY_LIST);
if (action == null) {
getPersistenceSession().makePersistent(targetAdapter);
} else {
@@ -208,7 +202,7 @@ public class EditTask extends Task {
public String getName() {
if (newType == null) {
return super.getName();
- }
+ }
return "New " + newType;
}
@@ -224,5 +218,4 @@ public class EditTask extends Task {
return IsisContext.getAuthenticationSession();
}
-
}
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java Sun Jan 22 08:05:17 2012
@@ -56,8 +56,7 @@ public final class InvokeMethod implemen
final boolean isContributedMethod = action.isContributed();
if (action.getParameterCount() == 0) {
executeImmediately = true;
- } else if (action.getParameterCount() == 1 && isContributedMethod
- && target.getSpecification().isOfType(action.getParameters().get(0).getSpecification())) {
+ } else if (action.getParameterCount() == 1 && isContributedMethod && target.getSpecification().isOfType(action.getParameters().get(0).getSpecification())) {
executeImmediately = true;
}
@@ -78,10 +77,10 @@ public final class InvokeMethod implemen
}
}
- static void displayMethodResult(final Request request, final Context context, final Page page,
- final ObjectAdapter result, final String targetId) {
+ static void displayMethodResult(final Request request, final Context context, final Page page, final ObjectAdapter result, final String targetId) {
if (result == null) {
- // TODO ask context for page to display - this will be the most recent object prior to the task
+ // TODO ask context for page to display - this will be the most
+ // recent object prior to the task
// null object - so just view service
request.forward(ForwardRequest.viewService(targetId));
} else {
@@ -93,7 +92,8 @@ public final class InvokeMethod implemen
forwardCollectionResult(request, context, result);
}
} else if (result.getSpecification().isValueOrIsAggregated()) {
- // TODO deal with this object properly, it might not be just a simple string
+ // TODO deal with this object properly, it might not be just a
+ // simple string
final List<String> messages = context.getMessages();
messages.add(0, "Action returned: " + result.titleString());
request.forward(ForwardRequest.viewObject(targetId));
@@ -112,8 +112,7 @@ public final class InvokeMethod implemen
static void forwardObjectResult(final Request request, final Context context, final ObjectAdapter resultAdapter) {
final String objectId = context.mapObject(resultAdapter);
- if (resultAdapter.isTransient()
- && resultAdapter.getSpecification().persistability() == Persistability.USER_PERSISTABLE) {
+ if (resultAdapter.isTransient() && resultAdapter.getSpecification().persistability() == Persistability.USER_PERSISTABLE) {
request.forward(ForwardRequest.editObject(objectId));
} else if (resultAdapter.getSpecification().isService()) {
request.forward(ForwardRequest.viewService(objectId));
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java Sun Jan 22 08:05:17 2012
@@ -79,8 +79,10 @@ public final class MethodTask extends Ta
initialState[i] = defaultParameterValues[i];
}
/*
- * noLines[i] = action.getParameterNoLines()[i]; wraps[i] = action.canParametersWrap()[i]; maxLength[i] =
- * action.getParameterMaxLengths()[i]; typicalLength[i] = action.getParameterTypicalLengths()[i];
+ * noLines[i] = action.getParameterNoLines()[i]; wraps[i] =
+ * action.canParametersWrap()[i]; maxLength[i] =
+ * action.getParameterMaxLengths()[i]; typicalLength[i] =
+ * action.getParameterTypicalLengths()[i];
*/
}
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java Sun Jan 22 08:05:17 2012
@@ -33,11 +33,11 @@ import org.apache.isis.viewer.html.conte
import org.apache.isis.viewer.html.request.Request;
/**
- * Represents a task that the user is working through. Is used for both editing objects and setting up parameters for an
- * action method.
+ * Represents a task that the user is working through. Is used for both editing
+ * objects and setting up parameters for an action method.
*/
public abstract class Task {
-
+
private static int nextID = 1;
private int[] boundaries;
private final String description;
@@ -60,8 +60,7 @@ public abstract class Task {
protected final int[] typicalLength;
protected final int id = nextID++;
- public Task(final Context context, final String name, final String description, final ObjectAdapter target,
- final int noFields) {
+ public Task(final Context context, final String name, final String description, final ObjectAdapter target, final int noFields) {
this.name = name;
this.description = description;
targetId = context.mapObject(target);
@@ -145,10 +144,8 @@ public abstract class Task {
debug.appendln("fields (" + names.length + ")");
debug.indent();
for (int i = 0; i < names.length; i++) {
- final String status =
- (readOnly[i] ? "R" : "-") + (optional[i] ? "O" : "M") + (errors[i] == null ? "-" : "E");
- debug.appendln(" " + i + " " + names[i] + " (" + status + "): "
- + fieldSpecifications[i].getFullIdentifier() + " -> " + entryText[i]);
+ final String status = (readOnly[i] ? "R" : "-") + (optional[i] ? "O" : "M") + (errors[i] == null ? "-" : "E");
+ debug.appendln(" " + i + " " + names[i] + " (" + status + "): " + fieldSpecifications[i].getFullIdentifier() + " -> " + entryText[i]);
}
debug.unindent();
debug.unindent();
@@ -351,10 +348,10 @@ public abstract class Task {
continue;
}
final ObjectSpecification spec = fieldSpecifications[i];
- // deal with check boxes specially: expect 'true' if checked and no entry if not checked, hence
+ // deal with check boxes specially: expect 'true' if checked and no
+ // entry if not checked, hence
// need to set as 'false'
- if (spec.isOfType(IsisContext.getSpecificationLoader().loadSpecification(boolean.class))
- || spec.isOfType(IsisContext.getSpecificationLoader().loadSpecification(Boolean.class))) {
+ if (spec.isOfType(IsisContext.getSpecificationLoader().loadSpecification(boolean.class)) || spec.isOfType(IsisContext.getSpecificationLoader().loadSpecification(Boolean.class))) {
if (textEntry == null || !textEntry.equals("true")) {
textEntry = "false";
}
@@ -378,8 +375,9 @@ public abstract class Task {
if (spec.isParseable()) {
if (textEntry == null) {
return;
- }
- // REVIEW this block uses the existing adapter as it contains the regex needed. This needs to
+ }
+ // REVIEW this block uses the existing adapter as it contains the
+ // regex needed. This needs to
// be reviewed in line with Dan's proposed changes to the reflector.
final ObjectAdapter valueAdapter = initialState[i];
final ParseableFacet parser = spec.getFacet(ParseableFacet.class);
Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java Sun Jan 22 08:05:17 2012
@@ -33,9 +33,7 @@ import org.apache.isis.viewer.html.conte
import org.apache.isis.viewer.html.request.Request;
public final class TaskStep implements Action {
- private void addSelector(final Context context, final Form form, final String currentEntry, final String fieldId,
- final String fieldLabel, final String fieldDescription, final boolean required, final String errorMessage,
- final Task task, final ObjectAdapter[] objects) {
+ private void addSelector(final Context context, final Form form, final String currentEntry, final String fieldId, final String fieldLabel, final String fieldDescription, final boolean required, final String errorMessage, final Task task, final ObjectAdapter[] objects) {
task.checkInstances(context, objects);
int size = 0;
@@ -63,29 +61,21 @@ public final class TaskStep implements A
form.addLookup(fieldLabel, fieldDescription, fieldId, selectedIndex, instances, ids, required, errorMessage);
}
- private void addSelectorForKnownReferences(final Context context, final Form form, final ObjectSpecification type,
- final String currentEntry, final String fieldId, final String fieldLabel, final String fieldDescription,
- final boolean required, final String errorMessage, final Task task) {
+ private void addSelectorForKnownReferences(final Context context, final Form form, final ObjectSpecification type, final String currentEntry, final String fieldId, final String fieldLabel, final String fieldDescription, final boolean required, final String errorMessage, final Task task) {
final ObjectAdapter[] objects = context.getKnownInstances(type);
- addSelector(context, form, currentEntry, fieldId, fieldLabel, fieldDescription, required, errorMessage, task,
- objects);
+ addSelector(context, form, currentEntry, fieldId, fieldLabel, fieldDescription, required, errorMessage, task, objects);
}
- private void addSelectorForObjectOptions(final Context context, final Form form, final String currentEntry,
- final String fieldId, final String fieldLabel, final String fieldDescription, final ObjectAdapter[] options,
- final boolean required, final String errorMessage, final Task task) {
+ private void addSelectorForObjectOptions(final Context context, final Form form, final String currentEntry, final String fieldId, final String fieldLabel, final String fieldDescription, final ObjectAdapter[] options, final boolean required, final String errorMessage, final Task task) {
final ObjectAdapter[] objects = new ObjectAdapter[options.length];
for (int i = 0; i < options.length; i++) {
objects[i] = options[i];
}
- addSelector(context, form, currentEntry, fieldId, fieldLabel, fieldDescription, required, errorMessage, task,
- objects);
+ addSelector(context, form, currentEntry, fieldId, fieldLabel, fieldDescription, required, errorMessage, task, objects);
}
- private void addSelectorForValueOptions(final Form form, final String currentEntry, final String fieldId,
- final String fieldLabel, final String fieldDescription, final ObjectAdapter[] options, final boolean required,
- final String errorMessage, final Task task) {
+ private void addSelectorForValueOptions(final Form form, final String currentEntry, final String fieldId, final String fieldLabel, final String fieldDescription, final ObjectAdapter[] options, final boolean required, final String errorMessage, final Task task) {
int selectedIndex = -1;
final String[] instances = new String[options.length];
for (int i = 0; i < options.length; i++) {
@@ -94,16 +84,12 @@ public final class TaskStep implements A
selectedIndex = i;
}
}
- form.addLookup(fieldLabel, fieldDescription, fieldId, selectedIndex, instances, instances, required,
- errorMessage);
+ form.addLookup(fieldLabel, fieldDescription, fieldId, selectedIndex, instances, instances, required, errorMessage);
}
- private void addTextFieldForParseable(final Form form, final ObjectSpecification type,
- final String currentEntryText, final String fieldId, final String fieldLabel, final String fieldDescription,
- final int noLines, final boolean wrap, final int maxLength, final int typicalLength, final boolean required,
- final String errorMessage) {
- form.addField(type, fieldLabel, fieldDescription, fieldId, currentEntryText, noLines, wrap, maxLength,
- typicalLength, required, errorMessage);
+ private void addTextFieldForParseable(final Form form, final ObjectSpecification type, final String currentEntryText, final String fieldId, final String fieldLabel, final String fieldDescription, final int noLines, final boolean wrap, final int maxLength, final int typicalLength,
+ final boolean required, final String errorMessage) {
+ form.addField(type, fieldLabel, fieldDescription, fieldId, currentEntryText, noLines, wrap, maxLength, typicalLength, required, errorMessage);
}
private void displayTask(final Context context, final Page page, final Task task) {
@@ -137,9 +123,7 @@ public final class TaskStep implements A
content.add(context.getComponentFactory().createInlineBlock("error", task.getError(), null));
}
- final Form form =
- context.getComponentFactory().createForm(task.getId(), name(), task.getStep(), task.numberOfSteps(),
- task.isEditing());
+ final Form form = context.getComponentFactory().createForm(task.getId(), name(), task.getStep(), task.numberOfSteps(), task.isEditing());
final String[] parameterLabels = task.getNames();
final String[] parameterDescriptions = task.getFieldDescriptions();
final String[] errors = task.getErrors();
@@ -161,19 +145,15 @@ public final class TaskStep implements A
final String currentEntryTitle = entryText[i];
final String error = errors[i];
if (readOnly[i]) {
- addReadOnlyField(form, paramSpec, fieldLabel, fieldDescription, currentEntryTitle);
+ addReadOnlyField(form, paramSpec, fieldLabel, fieldDescription, currentEntryTitle);
} else if (paramSpec.isParseable() && options[i] != null && options[i].length > 0) {
- addSelectorForValueOptions(form, currentEntryTitle, fieldId, fieldLabel, fieldDescription, options[i],
- !optional[i], error, task);
+ addSelectorForValueOptions(form, currentEntryTitle, fieldId, fieldLabel, fieldDescription, options[i], !optional[i], error, task);
} else if (paramSpec.isParseable()) {
- addTextFieldForParseable(form, paramSpec, currentEntryTitle, fieldId, fieldLabel, fieldDescription,
- noLines[i], canWrap[i], maxLength[i], typicalLength[i], !optional[i], error);
+ addTextFieldForParseable(form, paramSpec, currentEntryTitle, fieldId, fieldLabel, fieldDescription, noLines[i], canWrap[i], maxLength[i], typicalLength[i], !optional[i], error);
} else if (paramSpec.isNotCollection() && options[i] != null && options[i].length > 0) {
- addSelectorForObjectOptions(context, form, currentEntryTitle, fieldId, fieldLabel, fieldDescription,
- options[i], !optional[i], error, task);
+ addSelectorForObjectOptions(context, form, currentEntryTitle, fieldId, fieldLabel, fieldDescription, options[i], !optional[i], error, task);
} else if (paramSpec.isNotCollection()) {
- addSelectorForKnownReferences(context, form, paramSpec, currentEntryTitle, fieldId, fieldLabel,
- fieldDescription, !optional[i], error, task);
+ addSelectorForKnownReferences(context, form, paramSpec, currentEntryTitle, fieldId, fieldLabel, fieldDescription, !optional[i], error, task);
} else {
throw new IsisException();
}
@@ -182,7 +162,7 @@ public final class TaskStep implements A
}
private void addReadOnlyField(final Form form, final ObjectSpecification paramSpec, final String fieldLabel, final String fieldDescription, final String currentEntryTitle) {
- if(paramSpec.containsFacet(BooleanValueFacet.class)) {
+ if (paramSpec.containsFacet(BooleanValueFacet.class)) {
final boolean isSet = Boolean.parseBoolean(currentEntryTitle);
form.addReadOnlyCheckbox(fieldLabel, isSet, fieldDescription);
} else {
Modified: incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java Sun Jan 22 08:05:17 2012
@@ -66,8 +66,9 @@ public class ContextTest extends ProxyJu
}
/*
- * REVIEW public void testIdentityUsedToLookupCollection() { DummyCollectionAdapter collection1 = new
- * DummyCollectionAdapter(); String id = context.mapCollection(collection1); assertEquals(collection1,
+ * REVIEW public void testIdentityUsedToLookupCollection() {
+ * DummyCollectionAdapter collection1 = new DummyCollectionAdapter(); String
+ * id = context.mapCollection(collection1); assertEquals(collection1,
* context.getMappedCollection(id)); }
*/
public void testIdentityUsedToLookupObject() {
@@ -99,8 +100,10 @@ public class ContextTest extends ProxyJu
}
/*
- * REVIEW public void testRegisteredCollectionReturnDifferentIdentityForDifferentCollection() { replay(); String id
- * = context.mapCollection(new DummyCollectionAdapter()); String id2 = context.mapCollection(new
+ * REVIEW public void
+ * testRegisteredCollectionReturnDifferentIdentityForDifferentCollection() {
+ * replay(); String id = context.mapCollection(new
+ * DummyCollectionAdapter()); String id2 = context.mapCollection(new
* DummyCollectionAdapter()); assertNotSame(id, id2); verify(); }
*/
@@ -119,10 +122,13 @@ public class ContextTest extends ProxyJu
}
/*
- * TODO reinstate public void testClearRemovesObject() { replay(); DummyObjectAdapter object = new
- * DummyObjectAdapter(new DummyOid(13)); String id = context.mapObject(object); context.clearMappedObject(object);
- * try { context.getMappedObject(id); fail(); } catch (ObjectAdapterRuntimeException expected) {
- * assertEquals("No object in object map with id " + id, expected.getMessage()); } verify(); }
+ * TODO reinstate public void testClearRemovesObject() { replay();
+ * DummyObjectAdapter object = new DummyObjectAdapter(new DummyOid(13));
+ * String id = context.mapObject(object); context.clearMappedObject(object);
+ * try { context.getMappedObject(id); fail(); } catch
+ * (ObjectAdapterRuntimeException expected) {
+ * assertEquals("No object in object map with id " + id,
+ * expected.getMessage()); } verify(); }
*/
public void testRegisteredObjectReturnDifferentIdentityForDifferentObject() {
final ObjectAdapter dummyObjectAdapter = system.createPersistentTestObject();
Modified: incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java (original)
+++ incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ObjectActionNoop.java Sun Jan 22 08:05:17 2012
@@ -43,10 +43,12 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
/**
- * Has no functionality but makes it easier to write tests that require an instance of an {@link Identifier}.
+ * Has no functionality but makes it easier to write tests that require an
+ * instance of an {@link Identifier}.
*
* <p>
- * Was previously DummyAction, in the web viewer project. Only used by tests there.
+ * Was previously DummyAction, in the web viewer project. Only used by tests
+ * there.
*/
public class ObjectActionNoop implements ObjectAction {
@@ -166,12 +168,12 @@ public class ObjectActionNoop implements
}
@Override
- public ObjectActionParameter getParameterById(String paramId) {
+ public ObjectActionParameter getParameterById(final String paramId) {
return null;
}
@Override
- public ObjectActionParameter getParameterByName(String paramName) {
+ public ObjectActionParameter getParameterByName(final String paramName) {
return null;
}
@@ -206,8 +208,7 @@ public class ObjectActionNoop implements
}
@Override
- public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
+ public VisibilityContext<?> createVisibleInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter targetObjectAdapter) {
return null;
}
@@ -242,15 +243,12 @@ public class ObjectActionNoop implements
}
@Override
- public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter target) {
+ public UsabilityContext<?> createUsableInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter target) {
return null;
}
@Override
- public ActionInvocationContext createActionInvocationInteractionContext(final AuthenticationSession session,
- final InteractionInvocationMethod invocationMethod, final ObjectAdapter object,
- final ObjectAdapter[] candidateArguments) {
+ public ActionInvocationContext createActionInvocationInteractionContext(final AuthenticationSession session, final InteractionInvocationMethod invocationMethod, final ObjectAdapter object, final ObjectAdapter[] candidateArguments) {
return null;
}
@@ -301,12 +299,13 @@ public class ObjectActionNoop implements
/*
* (non-Javadoc)
*
- * @see org.apache.isis.core.metamodel.spec.feature.ObjectFeature#getFeatureType()
+ * @see
+ * org.apache.isis.core.metamodel.spec.feature.ObjectFeature#getFeatureType
+ * ()
*/
@Override
public FeatureType getFeatureType() {
return FeatureType.ACTION;
}
-
}
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ClientRequestConfigurer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ClientRequestConfigurer.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ClientRequestConfigurer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/ClientRequestConfigurer.java Sun Jan 22 08:05:17 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.json.applib;
+package org.apache.isis.viewer.json.applib;
import java.util.Map;
@@ -30,20 +30,20 @@ import org.apache.isis.viewer.json.appli
import org.jboss.resteasy.client.ClientExecutor;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.specimpl.UriBuilderImpl;
-
/**
* Configures the body, query string etc of a {@link ClientRequest}.
*
* <p>
- * Needed because, unfortunately, {@link ClientRequest} does not seem to allow the
- * query string to be set directly (only {@link ClientRequest#getQueryParameters() query parameters}).
- * Instead, it is necessary to {@link UriBuilderImpl#replaceQuery(String) use} its underlying
- * {@link UriBuilderImpl}.
+ * Needed because, unfortunately, {@link ClientRequest} does not seem to allow
+ * the query string to be set directly (only
+ * {@link ClientRequest#getQueryParameters() query parameters}). Instead, it is
+ * necessary to {@link UriBuilderImpl#replaceQuery(String) use} its underlying
+ * {@link UriBuilderImpl}.
*/
public class ClientRequestConfigurer {
-
- public static ClientRequestConfigurer create(ClientExecutor executor, String uriTemplate) {
+
+ public static ClientRequestConfigurer create(final ClientExecutor executor, final String uriTemplate) {
final UriBuilder uriBuilder = new UriBuilderImpl().uriTemplate(uriTemplate);
final ClientRequest clientRequest = executor.createRequest(uriBuilder);
return new ClientRequestConfigurer(clientRequest, uriBuilder);
@@ -57,20 +57,21 @@ public class ClientRequestConfigurer {
this.uriBuilder = uriBuilder;
}
- public ClientRequestConfigurer accept(MediaType mediaType) {
+ public ClientRequestConfigurer accept(final MediaType mediaType) {
clientRequest.accept(mediaType);
return this;
}
- public ClientRequestConfigurer header(String name, String value) {
+ public ClientRequestConfigurer header(final String name, final String value) {
clientRequest.header(name, value);
return this;
}
/**
- * Prerequisite to {@link #configureArgs(JsonRepresentation)} or {@link #configureArgs(Map)}.
+ * Prerequisite to {@link #configureArgs(JsonRepresentation)} or
+ * {@link #configureArgs(Map)}.
*/
- public ClientRequestConfigurer setHttpMethod(HttpMethod httpMethod) {
+ public ClientRequestConfigurer setHttpMethod(final HttpMethod httpMethod) {
clientRequest.setHttpMethod(httpMethod.getJavaxRsMethod());
return this;
}
@@ -86,31 +87,32 @@ public class ClientRequestConfigurer {
* <li> {@link RestfulRequest#execute()} - which calls this method.
* </ul>
*/
- public ClientRequestConfigurer configureArgs(Map<RequestParameter<?>, Object> args) {
- if(clientRequest.getHttpMethod() == null) {
+ public ClientRequestConfigurer configureArgs(final Map<RequestParameter<?>, Object> args) {
+ if (clientRequest.getHttpMethod() == null) {
throw new IllegalStateException("Must set up http method first");
}
-
- JsonRepresentation argsAsMap = JsonRepresentation.newMap();
- for (RequestParameter<?> requestParam : args.keySet()) {
+
+ final JsonRepresentation argsAsMap = JsonRepresentation.newMap();
+ for (final RequestParameter<?> requestParam : args.keySet()) {
put(args, requestParam, argsAsMap);
}
getHttpMethod().setUpArgs(this, argsAsMap);
return this;
}
- private <P> void put(Map<RequestParameter<?>, Object> args, RequestParameter<P> requestParam, JsonRepresentation argsAsMap) {
+ private <P> void put(final Map<RequestParameter<?>, Object> args, final RequestParameter<P> requestParam, final JsonRepresentation argsAsMap) {
@SuppressWarnings("unchecked")
- final P value = (P)args.get(requestParam);
+ final P value = (P) args.get(requestParam);
final String valueStr = requestParam.getParser().asString(value);
argsAsMap.mapPut(requestParam.getName(), valueStr);
}
/**
- * Used when following links ({@link RestfulClient#follow(LinkRepresentation)}).
+ * Used when following links (
+ * {@link RestfulClient#follow(LinkRepresentation)}).
*/
- public ClientRequestConfigurer configureArgs(JsonRepresentation requestArgs) {
- if(clientRequest.getHttpMethod() == null) {
+ public ClientRequestConfigurer configureArgs(final JsonRepresentation requestArgs) {
+ if (clientRequest.getHttpMethod() == null) {
throw new IllegalStateException("Must set up http method first");
}
@@ -119,31 +121,34 @@ public class ClientRequestConfigurer {
}
/**
- * Called back from {@link HttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
+ * Called back from
+ * {@link HttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
*/
- ClientRequestConfigurer body(JsonRepresentation requestArgs) {
+ ClientRequestConfigurer body(final JsonRepresentation requestArgs) {
clientRequest.body(MediaType.APPLICATION_JSON_TYPE, requestArgs.toString());
return this;
}
/**
- * Called back from {@link HttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
+ * Called back from
+ * {@link HttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
*/
- ClientRequestConfigurer queryString(JsonRepresentation requestArgs) {
- if(requestArgs.size() == 0) {
+ ClientRequestConfigurer queryString(final JsonRepresentation requestArgs) {
+ if (requestArgs.size() == 0) {
return this;
- }
+ }
final String queryString = UrlEncodingUtils.asUrlEncoded(requestArgs.toString());
uriBuilder.replaceQuery(queryString);
return this;
}
/**
- * Called back from {@link HttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
+ * Called back from
+ * {@link HttpMethod#setUpArgs(ClientRequestConfigurer, JsonRepresentation)}
*/
- ClientRequestConfigurer queryArgs(JsonRepresentation requestArgs) {
+ ClientRequestConfigurer queryArgs(final JsonRepresentation requestArgs) {
final MultivaluedMap<String, String> queryParameters = clientRequest.getQueryParameters();
- for(Map.Entry<String, JsonRepresentation> entry: requestArgs.mapIterable()) {
+ for (final Map.Entry<String, JsonRepresentation> entry : requestArgs.mapIterable()) {
final String param = entry.getKey();
final JsonRepresentation argRepr = entry.getValue();
final String arg = UrlEncodingUtils.asUrlEncoded(argRepr.asArg());
@@ -164,5 +169,4 @@ public class ClientRequestConfigurer {
return HttpMethod.valueOf(httpMethod);
}
-
}
\ No newline at end of file
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod.java?rev=1234460&r1=1234459&r2=1234460&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/main/java/org/apache/isis/viewer/json/applib/HttpMethod.java Sun Jan 22 08:05:17 2012
@@ -16,24 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.json.applib;
-
+package org.apache.isis.viewer.json.applib;
+
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.specimpl.UriBuilderImpl;
-
-public enum HttpMethod {
- GET(javax.ws.rs.HttpMethod.GET, ArgStrategy.QUERY_STRING),
- PUT(javax.ws.rs.HttpMethod.PUT, ArgStrategy.BODY),
- DELETE(javax.ws.rs.HttpMethod.DELETE, ArgStrategy.QUERY_STRING),
- POST(javax.ws.rs.HttpMethod.POST, ArgStrategy.BODY);
-
+
+public enum HttpMethod {
+ GET(javax.ws.rs.HttpMethod.GET, ArgStrategy.QUERY_STRING), PUT(javax.ws.rs.HttpMethod.PUT, ArgStrategy.BODY), DELETE(javax.ws.rs.HttpMethod.DELETE, ArgStrategy.QUERY_STRING), POST(javax.ws.rs.HttpMethod.POST, ArgStrategy.BODY);
+
private enum ArgStrategy {
/**
* Individually encodes each query arg.
- */
+ */
QUERY_ARGS {
@Override
- void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs) {
+ void setUpArgs(final ClientRequestConfigurer clientRequestConfigurer, final JsonRepresentation requestArgs) {
clientRequestConfigurer.queryArgs(requestArgs);
}
},
@@ -42,48 +39,51 @@ public enum HttpMethod {
*/
QUERY_STRING {
@Override
- void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs) {
+ void setUpArgs(final ClientRequestConfigurer clientRequestConfigurer, final JsonRepresentation requestArgs) {
clientRequestConfigurer.queryString(requestArgs);
}
},
BODY {
@Override
- void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs) {
+ void setUpArgs(final ClientRequestConfigurer clientRequestConfigurer, final JsonRepresentation requestArgs) {
clientRequestConfigurer.body(requestArgs);
}
- };
+ };
abstract void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs);
- }
-
- private final String javaxRsMethod;
+ }
+
+ private final String javaxRsMethod;
private final ArgStrategy argStrategy;
-
- private HttpMethod(String javaxRsMethod, ArgStrategy argStrategy) {
+
+ private HttpMethod(final String javaxRsMethod, final ArgStrategy argStrategy) {
this.javaxRsMethod = javaxRsMethod;
- this.argStrategy = argStrategy;
- }
+ this.argStrategy = argStrategy;
+ }
public String getJavaxRsMethod() {
return javaxRsMethod;
}
/**
- * It's a bit nasty that we need to ask for the {@link UriBuilderImpl} as well as the {@link ClientRequest},
- * but that's because the {@link ClientRequest} does not allow us to setup raw query strings (only query name/arg pairs)
+ * It's a bit nasty that we need to ask for the {@link UriBuilderImpl} as
+ * well as the {@link ClientRequest}, but that's because the
+ * {@link ClientRequest} does not allow us to setup raw query strings (only
+ * query name/arg pairs)
*
* @param restEasyRequest
- * @param uriBuilder - that sits underneath the restEasyRequest
+ * @param uriBuilder
+ * - that sits underneath the restEasyRequest
* @param requestArgs
- */
- public void setUpArgs(ClientRequestConfigurer clientRequestConfigurer, JsonRepresentation requestArgs) {
- clientRequestConfigurer.setHttpMethod(this);
- if(requestArgs == null) {
- return;
- }
- if(!requestArgs.isMap()) {
- throw new IllegalArgumentException("requestArgs must be a map; instead got: " + requestArgs);
- }
- argStrategy.setUpArgs(clientRequestConfigurer, requestArgs);
- }
-
-}
+ */
+ public void setUpArgs(final ClientRequestConfigurer clientRequestConfigurer, final JsonRepresentation requestArgs) {
+ clientRequestConfigurer.setHttpMethod(this);
+ if (requestArgs == null) {
+ return;
+ }
+ if (!requestArgs.isMap()) {
+ throw new IllegalArgumentException("requestArgs must be a map; instead got: " + requestArgs);
+ }
+ argStrategy.setUpArgs(clientRequestConfigurer, requestArgs);
+ }
+
+}