litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate last dependencies on commons-lang 2.x

Browse source
This commit is contained in:
Graham Triggs 2016-12-24 12:27:26 +00:00
parent 890d908a6a
commit 49c5b561f9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
View file

@ -68,7 +68,7 @@ public class EditN3GeneratorVTwo {
} }
log.debug("The original value String is " + values.toString()); log.debug("The original value String is " + values.toString());
String valueString = org.apache.commons.lang.StringUtils.join(values, String valueString = org.apache.commons.lang3.StringUtils.join(values,
">, <"); ">, <");
valueString = "<" + valueString + ">"; valueString = "<" + valueString + ">";
log.debug("The multiUri value String is " + valueString); log.debug("The multiUri value String is " + valueString);
@ -233,7 +233,7 @@ public class EditN3GeneratorVTwo {
log.debug("value of literal for " + var + " was null"); log.debug("value of literal for " + var + " was null");
} }
} }
String valueString = org.apache.commons.lang.StringUtils.join(n3Values, ","); String valueString = org.apache.commons.lang3.StringUtils.join(n3Values, ",");
//Substitute it in to n3 //Substitute it in to n3
String varRegex = "\\?" + var + "(?=\\p{Punct}|\\p{Space}|$)"; String varRegex = "\\?" + var + "(?=\\p{Punct}|\\p{Space}|$)";

4
api/src/main/java/org/linkeddatafragments/util/MIMEParse.java
View file

@ -1,6 +1,6 @@
package org.linkeddatafragments.util; package org.linkeddatafragments.util;
import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.lang3.math.NumberUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.linkeddatafragments.exceptions.NoRegisteredMimeTypesException; import org.linkeddatafragments.exceptions.NoRegisteredMimeTypesException;
@ -278,7 +278,7 @@ public final class MIMEParse
FitnessAndQuality lastOne = weightedMatches FitnessAndQuality lastOne = weightedMatches
.get(weightedMatches.size() - 1); .get(weightedMatches.size() - 1);
return NumberUtils.compare(lastOne.quality, 0) != 0 ? lastOne.mimeType : supported.get(0); return Float.compare(lastOne.quality, 0.0f) != 0 ? lastOne.mimeType : supported.get(0);
} }
/** /**