Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Efficiencies: avoid constructing new Objects, auto boxing, etc. #448

Merged
merged 1 commit into from
Sep 8, 2016
Merged

Efficiencies: avoid constructing new Objects, auto boxing, etc. #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/marklogic/client/alerting/RuleDefinitionList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ protected void receiveContent(InputStream content) {
HandleAccessor.receiveContent(domHandle, content);
Document document = domHandle.get();
NodeList ruleNodes = document.getElementsByTagNameNS(RequestConstants.RESTAPI_NS, "rule");
for (int i=0; i < ruleNodes.getLength(); i++) {
int ruleNodesLength = ruleNodes.getLength();
for (int i=0; i < ruleNodesLength; i++) {
Element ruleElement = (Element) ruleNodes.item(i);
RuleDefinition ruleDefinition = new RuleDefinition();
ruleDefinition.receiveElement(ruleElement);
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/marklogic/client/impl/GraphManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import com.marklogic.client.semantics.Capability;
import com.marklogic.client.semantics.GraphManager;
import com.marklogic.client.semantics.GraphPermissions;
import java.util.Map;

public class GraphManagerImpl<R extends TriplesReadHandle, W extends TriplesWriteHandle>
extends AbstractLoggingManager
Expand Down Expand Up @@ -142,11 +143,11 @@ private JacksonHandle generatePermissions(GraphPermissions permissions) {
ObjectNode payload = mapper.createObjectNode();
ArrayNode permissionsNode = mapper.createArrayNode();
payload.set("permissions", permissionsNode);
for ( String role : permissions.keySet() ) {
for ( Map.Entry<String,Set<Capability>> entry : permissions.entrySet() ) {
ObjectNode permissionNode = mapper.createObjectNode();
permissionNode.put("role-name", role);
permissionNode.put("role-name", entry.getKey());
ArrayNode capabilitiesNode = mapper.createArrayNode();
for ( Capability capability : permissions.get(role) ) {
for ( Capability capability : entry.getValue() ) {
capabilitiesNode.add(capability.toString().toLowerCase());
}
permissionNode.set("capabilities", capabilitiesNode);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/marklogic/client/impl/HTTPKerberosAuthFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public ClientResponse handle(final ClientRequest request) throws ClientHandlerEx

// Add the whole Authorization line to the header
try {
String authLine = new String("Negotiate "+ getAuthorizationHeader("HTTP/" + host));
String authLine = "Negotiate "+ getAuthorizationHeader("HTTP/" + host);
request.getHeaders().add(HttpHeaders.AUTHORIZATION, authLine);
} catch (Exception e) {
throw new FailedRequestException(e.getMessage(), e);
Expand Down
50 changes: 25 additions & 25 deletions src/main/java/com/marklogic/client/impl/JerseyServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ private int makeFirstRequest(int retry) {
response.close();

String retryAfterRaw = responseHeaders.getFirst("Retry-After");
int retryAfter = (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
int retryAfter = (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;
return Math.max(retryAfter, calculateDelay(randRetry, retry));
}

Expand Down Expand Up @@ -652,7 +652,7 @@ public boolean getDocument(RequestLogger reqlog, DocumentDescriptor desc,
private int getRetryAfterTime(ClientResponse response) {
MultivaluedMap<String, String> responseHeaders = response.getHeaders();
String retryAfterRaw = responseHeaders.getFirst("Retry-After");
return (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
return (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;
}

private ClientResponse makeRequest(Builder builder, Function<Builder, ClientResponse> doFunction, Consumer<Boolean> resendableConsumer) {
Expand Down Expand Up @@ -1341,7 +1341,7 @@ private TemporalDescriptor putPostDocumentImpl(RequestLogger reqlog, String meth
((uri != null) ? uri : "new document"));
}

int retryAfter = (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
int retryAfter = (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;
nextDelay = Math.max(retryAfter, calculateDelay(randRetry, retry));
}
if (status == ClientResponse.Status.SERVICE_UNAVAILABLE) {
Expand Down Expand Up @@ -1485,7 +1485,7 @@ private TemporalDescriptor putPostDocumentImpl(RequestLogger reqlog, String meth
((uri != null) ? uri : "new document"));
}

int retryAfter = (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
int retryAfter = (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;
nextDelay = Math.max(retryAfter, calculateDelay(randRetry, retry));
}
if (status == ClientResponse.Status.SERVICE_UNAVAILABLE) {
Expand Down Expand Up @@ -1880,7 +1880,7 @@ private long getHeaderServerTimestamp(MultivaluedMap<String,String> headers) {
if (values != null) {
String timestamp = values.get(0);
if (timestamp != null && timestamp.length() > 0) {
return Long.valueOf(timestamp);
return Long.parseLong(timestamp);
}
}
return -1;
Expand All @@ -1898,7 +1898,7 @@ private long getHeaderLength(MultivaluedMap<String, String> headers) {
if (headers.containsKey(HttpHeaders.CONTENT_LENGTH)) {
List<String> values = headers.get(HttpHeaders.CONTENT_LENGTH);
if (values != null) {
return Long.valueOf(values.get(0));
return Long.parseLong(values.get(0));
}
}
return ContentDescriptor.UNKNOWN_LENGTH;
Expand All @@ -1920,7 +1920,7 @@ private void updateVersion(DocumentDescriptor descriptor,
if (values != null) {
// trim the double quotes
String value = values.get(0);
version = Long.valueOf(value.substring(1, value.length() - 1));
version = Long.parseLong(value.substring(1, value.length() - 1));
}
}
descriptor.setVersion(version);
Expand Down Expand Up @@ -2195,7 +2195,7 @@ ClientResponse getResponse() {

MultivaluedMap<String, String> responseHeaders = response.getHeaders();
String retryAfterRaw = responseHeaders.getFirst("Retry-After");
int retryAfter = (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
int retryAfter = (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;

response.close();

Expand Down Expand Up @@ -2736,7 +2736,7 @@ private void putPostValueImpl(RequestLogger reqlog, String method,
"Cannot retry request for " + connectPath);
}

int retryAfter = (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
int retryAfter = (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;
nextDelay = Math.max(retryAfter, calculateDelay(randRetry, retry));
}
if (status == ClientResponse.Status.SERVICE_UNAVAILABLE) {
Expand Down Expand Up @@ -3050,7 +3050,7 @@ public <R extends AbstractReadHandle, W extends AbstractWriteHandle> R putResour
"Cannot retry request for " + path);
}

int retryAfter = (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
int retryAfter = (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;
nextDelay = Math.max(retryAfter, calculateDelay(randRetry, retry));
}
if (status == ClientResponse.Status.SERVICE_UNAVAILABLE) {
Expand Down Expand Up @@ -3201,7 +3201,7 @@ public <R extends AbstractReadHandle, W extends AbstractWriteHandle> R postResou
"Cannot retry request for " + path);
}

int retryAfter = (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
int retryAfter = (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;
nextDelay = Math.max(retryAfter, calculateDelay(randRetry, retry));
}
if (status == ClientResponse.Status.SERVICE_UNAVAILABLE) {
Expand Down Expand Up @@ -3472,16 +3472,16 @@ public String getString() {
@Override
public Number getNumber() {
if ( getType() == EvalResult.Type.DECIMAL ) return new BigDecimal(getString());
else if ( getType() == EvalResult.Type.DOUBLE ) return new Double(getString());
else if ( getType() == EvalResult.Type.FLOAT ) return new Float(getString());
else if ( getType() == EvalResult.Type.DOUBLE ) return Double.valueOf(getString());
else if ( getType() == EvalResult.Type.FLOAT ) return Float.valueOf(getString());
// MarkLogic integers can be much larger than Java integers, so we'll use Long instead
else if ( getType() == EvalResult.Type.INTEGER ) return new Long(getString());
else if ( getType() == EvalResult.Type.INTEGER ) return Long.valueOf(getString());
else return new BigDecimal(getString());
}

@Override
public Boolean getBoolean() {
return new Boolean(getString());
return Boolean.valueOf(getString());
}

}
Expand Down Expand Up @@ -3727,7 +3727,7 @@ private <W extends AbstractWriteHandle, U extends JerseyResultIterator> U postIt
"Cannot retry request for " + path);
}

int retryAfter = (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
int retryAfter = (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;
nextDelay = Math.max(retryAfter, calculateDelay(randRetry, retry));
}
if (status == ClientResponse.Status.SERVICE_UNAVAILABLE) {
Expand Down Expand Up @@ -4456,7 +4456,7 @@ public long getSize() {
}

public JerseyResultIterator<T> setSize(long size) {
this.size = new Long(size);
this.size = size;
return this;
}

Expand Down Expand Up @@ -4789,7 +4789,7 @@ public InputStream match(QueryDefinition queryDef,

MultivaluedMap<String, String> responseHeaders = response.getHeaders();
String retryAfterRaw = responseHeaders.getFirst("Retry-After");
int retryAfter = (retryAfterRaw != null) ? Integer.valueOf(retryAfterRaw) : -1;
int retryAfter = (retryAfterRaw != null) ? Integer.parseInt(retryAfterRaw) : -1;

response.close();

Expand Down Expand Up @@ -4868,10 +4868,10 @@ private void addGraphUriParam(RequestParameters params, String uri) {

private void addPermsParams(RequestParameters params, GraphPermissions permissions) {
if ( permissions != null ) {
for ( String role : permissions.keySet() ) {
if ( permissions.get(role) != null ) {
for ( Capability capability : permissions.get(role) ) {
params.add("perm:" + role, capability.toString().toLowerCase());
for ( Map.Entry<String,Set<Capability>> entry : permissions.entrySet() ) {
if ( entry.getValue() != null ) {
for ( Capability capability : entry.getValue() ) {
params.add("perm:" + entry.getKey(), capability.toString().toLowerCase());
}
}
}
Expand Down Expand Up @@ -5026,10 +5026,10 @@ public <R extends AbstractReadHandle> R executeSparql(RequestLogger reqlog,
addPermsParams(params, qdef.getUpdatePermissions());
String sparql = qdef.getSparql();
SPARQLBindings bindings = qdef.getBindings();
for ( String bindingName : bindings.keySet() ) {
String paramName = "bind:" + bindingName;
for ( Map.Entry<String,List<SPARQLBinding>> entry : bindings.entrySet() ) {
String paramName = "bind:" + entry.getKey();
String typeOrLang = "";
for ( SPARQLBinding binding : bindings.get(bindingName) ) {
for ( SPARQLBinding binding : entry.getValue() ) {
if ( binding.getDatatype() != null ) {
typeOrLang = ":" + binding.getDatatype();
} else if ( binding.getLanguageTag() != null ) {
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/marklogic/client/impl/QueryOptionsTransformExtractNS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.xml.sax.helpers.XMLFilterImpl;

import java.util.HashMap;
import java.util.Map;
import java.util.Vector;

public class QueryOptionsTransformExtractNS extends XMLFilterImpl {
Expand Down Expand Up @@ -50,10 +51,10 @@ public void startElement(String uri, String localName, String qName, Attributes
}

super.startElement(SEARCH_NS, ename, ename, null);
for (String pfx : nsmap.keySet()) {
for (Map.Entry<String,String> entry : nsmap.entrySet()) {
BindingAttributes attrs = new BindingAttributes();
attrs.addAttribute("prefix", pfx);
attrs.addAttribute("namespace-uri", nsmap.get(pfx));
attrs.addAttribute("prefix", entry.getKey());
attrs.addAttribute("namespace-uri", entry.getValue());
super.startElement(SEARCH_NS, "binding", "binding", attrs);
super.endElement(SEARCH_NS, "binding", "binding");
}
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/marklogic/client/impl/QueryOptionsTransformInjectNS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import javax.xml.XMLConstants;
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;

public class QueryOptionsTransformInjectNS extends XMLFilterImpl {
Expand Down Expand Up @@ -50,12 +51,12 @@ public void startElement(String uri, String localName, String qName, Attributes
BindingAttributes attrs = new BindingAttributes(attributes);
if ("path-index".equals(localName) || "searchable-expression".equals(localName)) {
String xmlns = null;
for (String pfx : nsmap.keySet()) {
for (Map.Entry<String,String> entry : nsmap.entrySet()) {
xmlns = "xmlns";
if (!"".equals(pfx)) {
xmlns += ":" + pfx;
if (!"".equals(entry.getKey())) {
xmlns += ":" + entry.getKey();
}
attrs.addAttribute(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, xmlns, nsmap.get(pfx));
attrs.addAttribute(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, xmlns, entry.getValue());
}
}

Expand Down
9 changes: 6 additions & 3 deletions src/main/java/com/marklogic/client/io/DocumentMetadataHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,8 @@ private void receiveMetadataValuesImpl(Document document) {
return;

NodeList valuesIn = document.getElementsByTagNameNS(REST_API_NS, "metadata-values");
for (int i = 0; i < valuesIn.getLength(); i++) {
int valuesInLength = valuesIn.getLength();
for (int i = 0; i < valuesInLength; i++) {
String key = null;
String value = null;

Expand Down Expand Up @@ -611,7 +612,8 @@ private void receiveCollectionsImpl(Document document) {
return;

NodeList collectionsIn = document.getElementsByTagNameNS(REST_API_NS, "collection");
for (int i=0; i < collectionsIn.getLength(); i++) {
int collectionsInLength = collectionsIn.getLength();
for (int i=0; i < collectionsInLength; i++) {
collections.add(collectionsIn.item(i).getTextContent());
}
}
Expand All @@ -623,7 +625,8 @@ private void receivePermissionsImpl(Document document) {
return;

NodeList permissionsIn = document.getElementsByTagNameNS(REST_API_NS, "permission");
for (int i=0; i < permissionsIn.getLength(); i++) {
int permissionsInLength = permissionsIn.getLength();
for (int i=0; i < permissionsInLength; i++) {
String roleName = null;
HashSet<Capability> caps = new HashSet<Capability>();

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/marklogic/client/test/GraphsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public void testTriples() throws Exception {
gmgr.write(tripleGraphUri, new StringHandle(ntriple5 + "\n" + ntriple6)
);
String triples5and6 = gmgr.readAs(tripleGraphUri, String.class);
String expected = new String(ntriple5 + "\n" + ntriple6);
String expected = ntriple5 + "\n" + ntriple6;
assertEquals(expected, triples5and6);

gmgr.merge(tripleGraphUri, new StringHandle(ntriple7));
Expand Down