Skip to content

Commit

Permalink
Refactored the content holder, added new properties.
Browse files Browse the repository at this point in the history
  • Loading branch information
nmihajlovski committed Nov 1, 2015
1 parent 5dfd33d commit 09c9e1d
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 5 deletions.
46 changes: 42 additions & 4 deletions rapidoid-ctx/src/main/java/org/rapidoid/ctx/Ctx.java
Expand Up @@ -2,7 +2,9 @@

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
Expand Down Expand Up @@ -52,9 +54,11 @@ public class Ctx {

private volatile String host;

private volatile String verb;

private volatile String uri;

private volatile String verb;
private volatile String path;

private volatile int referenceCounter = 1;

Expand Down Expand Up @@ -126,6 +130,16 @@ public void setUri(String uri) {
this.uri = uri;
}

public String path() {
ensureNotClosed();
return path;
}

public void setPath(String path) {
ensureNotClosed();
this.path = path;
}

public String verb() {
ensureNotClosed();
return verb;
Expand Down Expand Up @@ -205,10 +219,34 @@ private void ensureNotClosed() {
}

@Override
public synchronized String toString() {
public String toString() {
final int maxLen = 10;
return prefixed("[id=" + id + ", tag=" + tag + ", user=" + user + ", exchange=" + exchange + ", app=" + app
+ ", host=" + host + ", verb=" + verb + ", uri=" + uri + ", path=" + path + ", referenceCounter="
+ referenceCounter + ", persisters=" + persisters + ", closed=" + closed + ", allPersisters="
+ (allPersisters != null ? toString(allPersisters, maxLen) : null) + ", data="
+ (data != null ? toString(data.entrySet(), maxLen) : null) + ", session="
+ (session != null ? toString(session.entrySet(), maxLen) : null) + ", extras="
+ (extras != null ? toString(extras.entrySet(), maxLen) : null) + "]");
}

private String prefixed(String asStr) {
String isClosed = closed ? " <CLOSED>" : "";
return "Ctx#" + id + ":" + tag + isClosed + " [user=" + user + ", exchange=" + exchange + ", app=" + app
+ ", referenceCounter=" + referenceCounter + ", allPersisters=" + allPersisters.size() + "]";
String prefix = "Ctx#" + id + ":" + tag + isClosed;
return prefix + " " + asStr;
}

private String toString(Collection<?> collection, int maxLen) {
StringBuilder builder = new StringBuilder();
builder.append("[");
int i = 0;
for (Iterator<?> iterator = collection.iterator(); iterator.hasNext() && i < maxLen; i++) {
if (i > 0)
builder.append(", ");
builder.append(iterator.next());
}
builder.append("]");
return builder.toString();
}

public boolean isClosed() {
Expand Down
Expand Up @@ -32,12 +32,14 @@
import org.rapidoid.beany.Metadata;
import org.rapidoid.cls.Cls;
import org.rapidoid.cls.TypeKind;
import org.rapidoid.ctx.Ctx;
import org.rapidoid.ctx.Ctxs;
import org.rapidoid.html.FieldType;
import org.rapidoid.html.FormLayout;
import org.rapidoid.html.Tag;
import org.rapidoid.html.tag.InputTag;
import org.rapidoid.html.tag.TextareaTag;
import org.rapidoid.log.Log;
import org.rapidoid.model.Item;
import org.rapidoid.model.Models;
import org.rapidoid.model.Property;
Expand Down Expand Up @@ -97,12 +99,16 @@ public FormFieldWidget(FormMode mode, FormLayout layout, Item item, Property pro
private Var<?> initVar(Item item, Property prop) {
Object target = U.or(item.value(), item);
String varName = propVarName(target, prop.name());
Object initValue = Ctxs.ctx().data().get(varName);

Ctx ctx = Ctxs.get();
Object initValue = ctx != null ? ctx.data().get(varName) : null;

try {
return Models.propertyVar(varName, item, prop.name(), initValue);

} catch (Exception e) {
// FIXME x.errors().put(varName, "Invalid value!");
Log.warn("Invalid value for property: " + prop.name(), e);
return Models.propertyVar(varName, item, prop.name(), null);
}
}
Expand Down

0 comments on commit 09c9e1d

Please sign in to comment.