Skip to content
This repository has been archived by the owner on Jul 10, 2019. It is now read-only.

Commit

Permalink
squid:S1149 - Synchronized classes Vector, Hashtable, Stack and Strin…
Browse files Browse the repository at this point in the history 
…gBuffer should not be used
  • Loading branch information
George Kankava committed Apr 21, 2016
1 parent a78e270 commit e8743fc
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 46 deletions.
8 changes: 4 additions & 4 deletions core/src/main/java/com/digitalpebble/behemoth/Annotation.java
View file
Expand Up @@ -102,18 +102,18 @@ public int compareTo(Annotation target) {

/** Returns a String representation of the Annotation **/
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append(this.type).append("\t").append(start).append("\t")
StringBuilder builder = new StringBuilder();
builder.append(this.type).append("\t").append(start).append("\t")
.append(end);
if (features != null) {
Iterator<String> keysiter = features.keySet().iterator();
while (keysiter.hasNext()) {
String key = keysiter.next();
String value = features.get(key).toString();
buffer.append("\t").append(key).append("=").append(value);
builder.append("\t").append(key).append("=").append(value);
}
}
return buffer.toString();
return builder.toString();
}

}
32 changes: 16 additions & 16 deletions core/src/main/java/com/digitalpebble/behemoth/BehemothDocument.java
View file
Expand Up @@ -325,41 +325,41 @@ public String toString(boolean binaryContent) {
**/
public String toString(boolean showContent, boolean showAnnotations,
boolean showText, boolean showMD) {
StringBuffer buffer = new StringBuffer();
StringBuilder builder = new StringBuilder();

buffer.append("\nurl: ").append(url);
buffer.append("\ncontentType: ").append(contentType);
builder.append("\nurl: ").append(url);
builder.append("\ncontentType: ").append(contentType);
if (metadata != null && showMD) {
buffer.append("\nmetadata: ");
builder.append("\nmetadata: ");
for (Entry<Writable, Writable> e : metadata.entrySet()) {
buffer.append("\n\t");
buffer.append(e.getKey());
buffer.append(": ");
buffer.append(e.getValue());
builder.append("\n\t");
builder.append(e.getKey());
builder.append(": ");
builder.append(e.getValue());
}
}
if (showContent) {
buffer.append("\nContent:\n");
builder.append("\nContent:\n");
int maxLengthText = Math.min(200, content.length);
buffer.append(new String(Arrays.copyOfRange(content, 0,
builder.append(new String(Arrays.copyOfRange(content, 0,
maxLengthText)));
}
// try
// default
// encoding
if (this.text != null && showText) {
buffer.append("\nText:\n");
builder.append("\nText:\n");
int maxLengthText = Math.min(200, text.length());
buffer.append(text.substring(0, maxLengthText));
builder.append(text.substring(0, maxLengthText));
}
if (annotations == null || !showAnnotations)
return buffer.toString();
buffer.append("\nAnnotations:\n");
return builder.toString();
builder.append("\nAnnotations:\n");
for (Annotation ann : annotations) {
buffer.append("\t").append(ann.toString()).append("\n");
builder.append("\t").append(ann.toString()).append("\n");
}

return buffer.toString();
return builder.toString();
}

}
2 changes: 1 addition & 1 deletion core/src/main/java/com/digitalpebble/behemoth/DocumentFilter.java
View file
Expand Up @@ -112,7 +112,7 @@ public static DocumentFilter getFilters(Configuration conf) {
String v = ent.getValue();
k = k.substring(DocumentFilterParamNamePrefixKeep.length());

StringBuffer message = new StringBuffer();
StringBuilder message = new StringBuilder();
if (filter.negativeMode)
message.append("Negative ");
else
Expand Down
10 changes: 5 additions & 5 deletions io/src/main/java/com/digitalpebble/behemoth/io/warc/HttpResponse.java
View file
Expand Up @@ -43,7 +43,7 @@ public HttpResponse(byte[] response) throws ProtocolException, IOException {
PushbackInputStream in = // process response
new PushbackInputStream(new ByteArrayInputStream(response), BUFFER_SIZE);

StringBuffer line = new StringBuffer();
StringBuilder line = new StringBuilder();

boolean haveSeenNonContinueStatus = false;
while (!haveSeenNonContinueStatus) {
Expand Down Expand Up @@ -105,7 +105,7 @@ private void readPlainContent(InputStream in) throws IOException {
content = out.toByteArray();
}

private int parseStatusLine(PushbackInputStream in, StringBuffer line)
private int parseStatusLine(PushbackInputStream in, StringBuilder line)
throws IOException {
// skip first character if "\n"
if (peek(in) == '\n') {
Expand All @@ -132,7 +132,7 @@ private int parseStatusLine(PushbackInputStream in, StringBuffer line)
return code;
}

private void processHeaderLine(StringBuffer line) throws IOException {
private void processHeaderLine(StringBuilder line) throws IOException {

int colonIndex = line.indexOf(":"); // key is up to colon
if (colonIndex == -1) {
Expand All @@ -158,7 +158,7 @@ private void processHeaderLine(StringBuffer line) throws IOException {
}

// Adds headers to our headers Metadata
private void parseHeaders(PushbackInputStream in, StringBuffer line)
private void parseHeaders(PushbackInputStream in, StringBuilder line)
throws IOException {

while (readLine(in, line, true) != 0) {
Expand Down Expand Up @@ -189,7 +189,7 @@ private void parseHeaders(PushbackInputStream in, StringBuffer line)
}
}

private static int readLine(PushbackInputStream in, StringBuffer line,
private static int readLine(PushbackInputStream in, StringBuilder line,
boolean allowContinuedLine) throws IOException {
line.setLength(0);
for (int c = in.read(); c != -1; c = in.read()) {
Expand Down
14 changes: 6 additions & 8 deletions io/src/main/java/edu/cmu/lemurproject/WarcHTMLResponseRecord.java
View file
Expand Up @@ -39,9 +39,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URISyntaxException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Vector;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand All @@ -64,7 +62,7 @@ public class WarcHTMLResponseRecord {
.compile("^[hH][tT][tT][pP][sS]?://.*");

// create our pattern set
private Vector<Pattern> patternSet = new Vector<Pattern>();
private List<Pattern> patternSet = new ArrayList<Pattern>();

/**
* Default constructor
Expand Down Expand Up @@ -142,7 +140,7 @@ private String getNormalizedContentURL(String pageURL, String contentURL) {
return "";
}

private HashSet<String> getMatchesOutputSet(Vector<String> tagSet,
private HashSet<String> getMatchesOutputSet(List<String> tagSet,
String baseURL) {
HashSet<String> retSet = new HashSet<String>();

Expand Down Expand Up @@ -179,8 +177,8 @@ private HashSet<String> getMatchesOutputSet(Vector<String> tagSet,
*
* @return
*/
public Vector<String> getURLOutlinks() {
Vector<String> retVec = new Vector<String>();
public List<String> getURLOutlinks() {
List<String> retVec = new ArrayList<String>();

String baseURL = getTargetURI();
if ((baseURL == null) || (baseURL.length() == 0)) {
Expand All @@ -207,7 +205,7 @@ public Vector<String> getURLOutlinks() {
// now we have the rest of the lines
// read them all into a string buffer
// to remove all new lines
Vector<String> htmlTags = new Vector<String>();
List<String> htmlTags = new ArrayList<String>();
while ((line = inReader.readLine()) != null) {
// get all HTML tags from the line...
Matcher HTMLMatcher = ALL_HTML_TAGS.matcher(line);
Expand Down
8 changes: 4 additions & 4 deletions io/src/main/java/edu/cmu/lemurproject/WarcRecord.java
View file
Expand Up @@ -173,7 +173,7 @@ private static String readLineFromInputStream(DataInputStream in)
}

private static byte[] readNextRecord(DataInputStream in,
StringBuffer headerBuffer) throws IOException {
StringBuilder headerBuffer) throws IOException {
if (in == null) {
return null;
}
Expand Down Expand Up @@ -277,7 +277,7 @@ private static byte[] readNextRecord(DataInputStream in,
public static WarcRecord readNextWarcRecord(DataInputStream in)
throws IOException {
// LOG.info("Starting read of WARC record");
StringBuffer recordHeader = new StringBuffer();
StringBuilder recordHeader = new StringBuilder();
byte[] recordContent = readNextRecord(in, recordHeader);
if (recordContent == null) {
// LOG.info("WARC content is null - file is complete");
Expand Down Expand Up @@ -374,7 +374,7 @@ public void readFields(DataInput in) throws IOException {

@Override
public String toString() {
StringBuffer retBuffer = new StringBuffer();
StringBuilder retBuffer = new StringBuilder();

retBuffer.append(WARC_VERSION_LINE);
retBuffer.append(LINE_ENDING);
Expand Down Expand Up @@ -535,7 +535,7 @@ public String getHeaderRecordType() {

@Override
public String toString() {
StringBuffer retBuffer = new StringBuffer();
StringBuilder retBuffer = new StringBuilder();
retBuffer.append(warcHeader.toString());
retBuffer.append(LINE_ENDING);
retBuffer.append(new String(warcContent));
Expand Down
2 changes: 1 addition & 1 deletion mahout/src/main/java/com/digitalpebble/behemoth/mahout/util/Mahout2LibSVM.java
View file
Expand Up @@ -272,7 +272,7 @@ public void map(Text key, VectorWritable value,
OutputCollector<Text, Text> output, Reporter reporter)
throws IOException {
Vector v = value.get();
StringBuffer buffer = new StringBuffer();
StringBuilder buffer = new StringBuilder();
for (int i = 0; i < v.size(); i++) {
Element el = v.getElement(i);
int index = el.index();
Expand Down
6 changes: 3 additions & 3 deletions tika/src/main/java/com/digitalpebble/behemoth/tika/TikaMarkupHandler.java
View file
Expand Up @@ -35,14 +35,14 @@

public class TikaMarkupHandler implements BehemothHandler {

private StringBuffer textBuffer;
private StringBuilder textBuffer;

private List<Annotation> annotationBuffer;

private LinkedList<Annotation> startedAnnotations;

public TikaMarkupHandler() {
textBuffer = new StringBuffer();
textBuffer = new StringBuilder();
annotationBuffer = new LinkedList<Annotation>();
startedAnnotations = new LinkedList<Annotation>();
}
Expand All @@ -53,7 +53,7 @@ public void characters(char[] ch, int start, int length)
}

public void startDocument() throws SAXException {
textBuffer = new StringBuffer();
textBuffer = new StringBuilder();
annotationBuffer = new LinkedList<Annotation>();
startedAnnotations = new LinkedList<Annotation>();
}
Expand Down
2 changes: 1 addition & 1 deletion tika/src/main/java/com/digitalpebble/behemoth/tika/TikaProcessor.java
View file
Expand Up @@ -278,7 +278,7 @@ protected void processMetadata(BehemothDocument inputDoc, Metadata metadata) {
// at
// org.apache.hadoop.io.AbstractMapWritable.readFields(AbstractMapWritable.java:204)
// simply store multiple values as a , separated Text
StringBuffer buff = new StringBuffer();
StringBuilder buff = new StringBuilder();
for (int i = 0; i < values.length; i++) {
if (i > 0)
buff.append(",");
Expand Down
6 changes: 3 additions & 3 deletions tika/src/main/java/com/digitalpebble/behemoth/tika/TikaTextHandler.java
View file
Expand Up @@ -28,10 +28,10 @@

public class TikaTextHandler implements BehemothHandler {

private StringBuffer textBuffer;
private StringBuilder textBuffer;

public TikaTextHandler() {
textBuffer = new StringBuffer();
textBuffer = new StringBuilder();
}

public void characters(char[] ch, int start, int length)
Expand All @@ -40,7 +40,7 @@ public void characters(char[] ch, int start, int length)
}

public void startDocument() throws SAXException {
textBuffer = new StringBuffer();
textBuffer = new StringBuilder();

}

Expand Down

0 comments on commit e8743fc

Please sign in to comment.