Project

General

Profile

« Previous | Next » 

Revision 50642

using commons-lang3 3.5

View differences:

modules/cnr-misc-utils/trunk/src/main/java/eu/dnetlib/miscutils/functional/xml/IndentXmlString.java
1 1
package eu.dnetlib.miscutils.functional.xml;
2 2

  
3 3
import java.io.*;
4
import java.nio.charset.Charset;
5

  
6 4
import javax.xml.parsers.DocumentBuilder;
7 5
import javax.xml.parsers.DocumentBuilderFactory;
8 6
import javax.xml.parsers.ParserConfigurationException;
......
11 9
import javax.xml.transform.dom.DOMSource;
12 10
import javax.xml.transform.stream.StreamResult;
13 11

  
14
import org.apache.commons.lang.CharSetUtils;
12
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
13
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
14
import eu.dnetlib.miscutils.functional.UnaryFunction;
15 15
import org.w3c.dom.Document;
16 16
import org.xml.sax.InputSource;
17 17
import org.xml.sax.SAXException;
18 18

  
19
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
20
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
21

  
22
import eu.dnetlib.miscutils.functional.UnaryFunction;
23

  
24 19
/**
25 20
 * The Class IndentXmlString.
26 21
 */
modules/cnr-misc-utils/trunk/src/main/java/eu/dnetlib/miscutils/functional/xml/DnetXsltFunctions.java
2 2

  
3 3
import java.text.ParseException;
4 4
import java.text.SimpleDateFormat;
5
import java.util.*;
5
import java.util.Calendar;
6
import java.util.Date;
7
import java.util.GregorianCalendar;
8
import java.util.Random;
6 9
import java.util.regex.Matcher;
7 10
import java.util.regex.Pattern;
8 11

  
9 12
import com.google.common.base.Joiner;
10
import com.google.common.base.Predicate;
11
import com.google.common.collect.Iterables;
12
import org.apache.commons.lang.StringUtils;
13
import eu.dnetlib.miscutils.functional.hash.Hashing;
14
import org.apache.commons.lang3.StringUtils;
13 15
import org.apache.commons.logging.Log;
14 16
import org.apache.commons.logging.LogFactory;
15 17

  
16
import eu.dnetlib.miscutils.functional.hash.Hashing;
17

  
18 18
/**
19 19
 * This class provides some XSLT functions.
20 20
 * 
......
111 111
	}
112 112

  
113 113
	public static String join(final String s1, final String separator, final String s2) {
114
		if(StringUtils.isBlank(s1) || StringUtils.isBlank(s2)) {
114
		if(StringUtils.isBlank(s1) || StringUtils.isBlank(s2)){
115 115
			return "";
116 116
		}
117 117
		return Joiner.on(separator).join(s1, s2);
modules/cnr-misc-utils/trunk/src/main/java/eu/dnetlib/miscutils/functional/string/EscapeXml.java
1 1
package eu.dnetlib.miscutils.functional.string;
2

  
3
import org.apache.commons.lang.StringEscapeUtils;
4

  
5 2
import eu.dnetlib.miscutils.functional.UnaryFunction;
3
import org.apache.commons.lang3.StringEscapeUtils;
6 4

  
7 5
public class EscapeXml implements UnaryFunction<String, String> {
8 6
	@Override
9 7
	public String evaluate(String arg) {
10
		return StringEscapeUtils.escapeXml(arg);
8
		return StringEscapeUtils.escapeXml11(arg);
11 9
	}
12 10
}
modules/cnr-misc-utils/trunk/src/main/java/eu/dnetlib/miscutils/functional/string/EscapeHtml.java
1 1
package eu.dnetlib.miscutils.functional.string;
2 2

  
3
import org.apache.commons.lang.StringEscapeUtils;
4 3

  
5 4
import eu.dnetlib.miscutils.functional.UnaryFunction;
5
import org.apache.commons.lang3.StringEscapeUtils;
6 6

  
7 7
public class EscapeHtml implements UnaryFunction<String, String> {
8 8
	@Override
9 9
	public String evaluate(String arg) {
10
		return StringEscapeUtils.escapeHtml(arg);
10
		return StringEscapeUtils.escapeHtml4(arg);
11 11
	}
12 12
}
modules/cnr-misc-utils/trunk/src/main/java/eu/dnetlib/miscutils/functional/string/UnescapeHtml.java
1 1
package eu.dnetlib.miscutils.functional.string;
2 2

  
3
import org.apache.commons.lang.StringEscapeUtils;
4

  
5 3
import eu.dnetlib.miscutils.functional.UnaryFunction;
4
import org.apache.commons.lang3.StringEscapeUtils;
6 5

  
7 6
public class UnescapeHtml implements UnaryFunction<String, String> {
8 7

  
9 8
	@Override
10 9
	public String evaluate(final String arg) {
11
		return StringEscapeUtils.unescapeHtml(arg);
10
		return StringEscapeUtils.unescapeHtml4(arg);
12 11
	}
13 12
}
modules/cnr-misc-utils/trunk/pom.xml
16 16
	</scm>
17 17
	<dependencies>
18 18
		<dependency>
19
			<groupId>commons-lang</groupId>
20
			<artifactId>commons-lang</artifactId>
21
			<version>${commons.lang.version}</version>
19
			<groupId>org.apache.commons</groupId>
20
			<artifactId>commons-lang3</artifactId>
21
			<version>3.5</version>
22 22
		</dependency>
23 23
		<dependency>
24 24
			<groupId>commons-codec</groupId>

Also available in: Unified diff