From 49c5b561f91294304f24ac8660373e59cc2fe7b4 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Sat, 24 Dec 2016 12:27:26 +0000 Subject: [PATCH] Migrate last dependencies on commons-lang 2.x --- .../vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java | 4 ++-- api/src/main/java/org/linkeddatafragments/util/MIMEParse.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java index ebcbf100d..7b1803f4f 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java @@ -68,7 +68,7 @@ public class EditN3GeneratorVTwo { } 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 + ">"; log.debug("The multiUri value String is " + valueString); @@ -233,7 +233,7 @@ public class EditN3GeneratorVTwo { 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 String varRegex = "\\?" + var + "(?=\\p{Punct}|\\p{Space}|$)"; diff --git a/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java b/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java index c6c43f80b..1bc679071 100644 --- a/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java +++ b/api/src/main/java/org/linkeddatafragments/util/MIMEParse.java @@ -1,6 +1,6 @@ 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.linkeddatafragments.exceptions.NoRegisteredMimeTypesException; @@ -278,7 +278,7 @@ public final class MIMEParse FitnessAndQuality lastOne = weightedMatches .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); } /**