You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mt...@apache.org on 2019/04/27 19:34:27 UTC
svn commit: r1858295 [2/5] - in /ofbiz/ofbiz-framework/trunk:
applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/
applications/content/src/main/java/org/apache/ofbiz/content/content/
applications/content/src/main/java/org/apache/...
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/MiscConverters.java Sat Apr 27 19:34:25 2019
@@ -44,6 +44,7 @@ public class MiscConverters implements C
super(Blob.class, Blob.class);
}
+ @Override
public Blob convert(Blob obj) throws ConversionException {
try {
return new javax.sql.rowset.serial.SerialBlob(obj.getBytes(1, (int) obj.length()));
@@ -58,6 +59,7 @@ public class MiscConverters implements C
super(Blob.class, byte[].class);
}
+ @Override
public byte[] convert(Blob obj) throws ConversionException {
try {
return obj.getBytes(1, (int) obj.length());
@@ -72,6 +74,7 @@ public class MiscConverters implements C
super(byte[].class, Blob.class);
}
+ @Override
public Blob convert(byte[] obj) throws ConversionException {
try {
return new javax.sql.rowset.serial.SerialBlob(obj);
@@ -86,6 +89,7 @@ public class MiscConverters implements C
super(ByteBuffer.class, byte[].class);
}
+ @Override
public byte[] convert(ByteBuffer obj) throws ConversionException {
try {
return obj.hasArray() ? obj.array() : null;
@@ -100,6 +104,7 @@ public class MiscConverters implements C
super(byte[].class, ByteBuffer.class);
}
+ @Override
public ByteBuffer convert(byte[] obj) throws ConversionException {
try {
return ByteBuffer.wrap(obj);
@@ -114,6 +119,7 @@ public class MiscConverters implements C
super(Clob.class, String.class);
}
+ @Override
public String convert(Clob obj) throws ConversionException {
StringBuilder strBuf = new StringBuilder();
char[] inCharBuffer = new char[CHAR_BUFFER_SIZE];
@@ -148,6 +154,7 @@ public class MiscConverters implements C
return Enum.class.isAssignableFrom(sourceClass) && String.class.isAssignableFrom(targetClass);
}
+ @Override
public String convert(Enum<?> obj) throws ConversionException {
return obj.name();
}
@@ -164,10 +171,12 @@ public class MiscConverters implements C
}
public static class StringToEnumConverterCreator<E extends Enum<E>> implements ConverterCreator, ConverterLoader {
+ @Override
public void loadConverters() {
Converters.registerCreator(this);
}
+ @Override
public <S, T> Converter<S, T> createConverter(Class<S> sourceClass, Class<T> targetClass) {
if (String.class == sourceClass && Enum.class.isAssignableFrom(targetClass)) {
return UtilGenerics.cast(new StringToEnum<>());
@@ -186,6 +195,7 @@ public class MiscConverters implements C
return String.class.isAssignableFrom(sourceClass) && Enum.class.isAssignableFrom(targetClass);
}
+ @Override
public E convert(String obj) throws ConversionException {
throw new UnsupportedOperationException();
}
@@ -206,6 +216,7 @@ public class MiscConverters implements C
super(Locale.class, String.class);
}
+ @Override
public String convert(Locale obj) throws ConversionException {
return obj.toString();
}
@@ -216,6 +227,7 @@ public class MiscConverters implements C
super(String.class, Clob.class);
}
+ @Override
public Clob convert(String obj) throws ConversionException {
try {
return new javax.sql.rowset.serial.SerialClob(obj.toCharArray());
@@ -230,6 +242,7 @@ public class MiscConverters implements C
super(String.class, Locale.class);
}
+ @Override
public Locale convert(String obj) throws ConversionException {
Locale loc = UtilMisc.parseLocale(obj);
if (loc != null) {
@@ -244,6 +257,7 @@ public class MiscConverters implements C
super(DecimalFormat.class, String.class);
}
+ @Override
public String convert(DecimalFormat obj) throws ConversionException {
return obj.toPattern();
}
@@ -254,6 +268,7 @@ public class MiscConverters implements C
super(String.class, DecimalFormat.class);
}
+ @Override
public DecimalFormat convert(String obj) throws ConversionException {
return new DecimalFormat(obj);
}
@@ -264,6 +279,7 @@ public class MiscConverters implements C
super(SimpleDateFormat.class, String.class);
}
+ @Override
public String convert(SimpleDateFormat obj) throws ConversionException {
return obj.toPattern();
}
@@ -274,6 +290,7 @@ public class MiscConverters implements C
super(String.class, SimpleDateFormat.class);
}
+ @Override
public SimpleDateFormat convert(String obj) throws ConversionException {
return new SimpleDateFormat(obj);
}
@@ -284,6 +301,7 @@ public class MiscConverters implements C
super(Charset.class, String.class);
}
+ @Override
public String convert(Charset obj) throws ConversionException {
return obj.name();
}
@@ -294,6 +312,7 @@ public class MiscConverters implements C
super(String.class, Charset.class);
}
+ @Override
public Charset convert(String obj) throws ConversionException {
return Charset.forName(obj);
}
@@ -304,6 +323,7 @@ public class MiscConverters implements C
super(StringBuffer.class, String.class);
}
+ @Override
public String convert(StringBuffer obj) throws ConversionException {
return obj.toString();
}
@@ -314,6 +334,7 @@ public class MiscConverters implements C
super(StringUtil.StringWrapper.class, String.class);
}
+ @Override
public String convert(StringUtil.StringWrapper obj) {
return obj.toString();
}
@@ -324,6 +345,7 @@ public class MiscConverters implements C
super(UUID.class, String.class);
}
+ @Override
public String convert(UUID obj) throws ConversionException {
return obj.toString();
}
@@ -334,6 +356,7 @@ public class MiscConverters implements C
super(String.class, UUID.class);
}
+ @Override
public UUID convert(String obj) throws ConversionException {
return UUID.fromString(obj);
}
@@ -344,6 +367,7 @@ public class MiscConverters implements C
super(Pattern.class, String.class);
}
+ @Override
public String convert(Pattern obj) throws ConversionException {
return obj.toString();
}
@@ -354,6 +378,7 @@ public class MiscConverters implements C
super(String.class, Pattern.class);
}
+ @Override
public Pattern convert(String obj) throws ConversionException {
return Pattern.compile(obj);
}
@@ -370,6 +395,7 @@ public class MiscConverters implements C
}
}
+ @Override
public void loadConverters() {
Converters.loadContainedConverters(MiscConverters.class);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NetConverters.java Sat Apr 27 19:34:25 2019
@@ -34,6 +34,7 @@ public class NetConverters implements Co
super(String.class, InetAddress.class);
}
+ @Override
public InetAddress convert(String obj) throws ConversionException {
try {
return InetAddress.getByName(obj);
@@ -48,6 +49,7 @@ public class NetConverters implements Co
super(InetAddress.class, String.class);
}
+ @Override
public String convert(InetAddress obj) throws ConversionException {
String hostName = obj.getHostName();
if (hostName != null) {
@@ -62,6 +64,7 @@ public class NetConverters implements Co
super(String.class, URI.class);
}
+ @Override
public URI convert(String obj) throws ConversionException {
try {
return new URI(obj);
@@ -76,6 +79,7 @@ public class NetConverters implements Co
super(URI.class, String.class);
}
+ @Override
public String convert(URI obj) throws ConversionException {
return obj.toString();
}
@@ -86,6 +90,7 @@ public class NetConverters implements Co
super(String.class, URL.class);
}
+ @Override
public URL convert(String obj) throws ConversionException {
try {
return new URL(obj);
@@ -100,6 +105,7 @@ public class NetConverters implements Co
super(URL.class, String.class);
}
+ @Override
public String convert(URL obj) throws ConversionException {
return obj.toString();
}
@@ -110,6 +116,7 @@ public class NetConverters implements Co
super(URI.class, URL.class);
}
+ @Override
public URL convert(URI obj) throws ConversionException {
try {
return obj.toURL();
@@ -124,6 +131,7 @@ public class NetConverters implements Co
super(URL.class, URI.class);
}
+ @Override
public URI convert(URL obj) throws ConversionException {
try {
return obj.toURI();
@@ -133,6 +141,7 @@ public class NetConverters implements Co
}
}
+ @Override
public void loadConverters() {
Converters.loadContainedConverters(NetConverters.class);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java Sat Apr 27 19:34:25 2019
@@ -48,6 +48,7 @@ public class NumberConverters implements
super(String.class, targetClass);
}
+ @Override
public N convert(String obj, Locale locale, TimeZone timeZone) throws ConversionException {
String trimStr = StringUtil.removeSpaces(obj);
if (trimStr.length() == 0) {
@@ -64,6 +65,7 @@ public class NumberConverters implements
super(sourceClass, targetClass);
}
+ @Override
public T convert(S obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException {
return convert(obj, locale, null);
}
@@ -74,10 +76,12 @@ public class NumberConverters implements
super(sourceClass, String.class);
}
+ @Override
public String convert(N obj) throws ConversionException {
return obj.toString();
}
+ @Override
public String convert(N obj, Locale locale, TimeZone timeZone) throws ConversionException {
return format(obj, NumberFormat.getNumberInstance(locale));
}
@@ -90,6 +94,7 @@ public class NumberConverters implements
super(sourceClass, Double.class);
}
+ @Override
public Double convert(N obj) throws ConversionException {
return obj.doubleValue();
}
@@ -100,6 +105,7 @@ public class NumberConverters implements
super(sourceClass, Float.class);
}
+ @Override
public Float convert(N obj) throws ConversionException {
return obj.floatValue();
}
@@ -110,6 +116,7 @@ public class NumberConverters implements
super(sourceClass, Integer.class);
}
+ @Override
public Integer convert(N obj) throws ConversionException {
return obj.intValue();
}
@@ -120,6 +127,7 @@ public class NumberConverters implements
super(sourceClass, Long.class);
}
+ @Override
public Long convert(N obj) throws ConversionException {
return obj.longValue();
}
@@ -130,6 +138,7 @@ public class NumberConverters implements
super(sourceClass, Short.class);
}
+ @Override
public Short convert(N obj) throws ConversionException {
return obj.shortValue();
}
@@ -151,6 +160,7 @@ public class NumberConverters implements
super(Double.class, BigDecimal.class);
}
+ @Override
public BigDecimal convert(Double obj) throws ConversionException {
return BigDecimal.valueOf(obj);
}
@@ -183,6 +193,7 @@ public class NumberConverters implements
super(BigInteger.class);
}
+ @Override
public BigInteger convert(String obj) throws ConversionException {
return new BigInteger(obj);
}
@@ -209,6 +220,7 @@ public class NumberConverters implements
super(Float.class, BigDecimal.class);
}
+ @Override
public BigDecimal convert(Float obj) throws ConversionException {
return BigDecimal.valueOf(obj.doubleValue());
}
@@ -230,6 +242,7 @@ public class NumberConverters implements
super(Integer.class, BigDecimal.class);
}
+ @Override
public BigDecimal convert(Integer obj) throws ConversionException {
return BigDecimal.valueOf(obj);
}
@@ -240,6 +253,7 @@ public class NumberConverters implements
super(Integer.class, Byte.class);
}
+ @Override
public Byte convert(Integer obj) throws ConversionException {
return obj.byteValue();
}
@@ -261,6 +275,7 @@ public class NumberConverters implements
super(Long.class, BigDecimal.class);
}
+ @Override
public BigDecimal convert(Long obj) throws ConversionException {
return BigDecimal.valueOf(obj);
}
@@ -271,6 +286,7 @@ public class NumberConverters implements
super(Long.class, Byte.class);
}
+ @Override
public Byte convert(Long obj) throws ConversionException {
return obj.byteValue();
}
@@ -303,6 +319,7 @@ public class NumberConverters implements
super(BigDecimal.class);
}
+ @Override
public BigDecimal convert(String obj) throws ConversionException {
return new BigDecimal(obj);
}
@@ -321,6 +338,7 @@ public class NumberConverters implements
super(String.class, Byte.class);
}
+ @Override
public Byte convert(String obj) throws ConversionException {
return Byte.valueOf(obj);
}
@@ -331,6 +349,7 @@ public class NumberConverters implements
super(Double.class);
}
+ @Override
public Double convert(String obj) throws ConversionException {
return Double.valueOf(obj);
}
@@ -346,6 +365,7 @@ public class NumberConverters implements
super(Float.class);
}
+ @Override
public Float convert(String obj) throws ConversionException {
return Float.valueOf(obj);
}
@@ -361,6 +381,7 @@ public class NumberConverters implements
super(Integer.class);
}
+ @Override
public Integer convert(String obj) throws ConversionException {
return Integer.valueOf(obj);
}
@@ -376,6 +397,7 @@ public class NumberConverters implements
super(Long.class);
}
+ @Override
public Long convert(String obj) throws ConversionException {
return Long.valueOf(obj);
}
@@ -391,11 +413,13 @@ public class NumberConverters implements
super(String.class, Short.class);
}
+ @Override
public Short convert(String obj) throws ConversionException {
return Short.valueOf(obj);
}
}
+ @Override
public void loadConverters() {
Converters.loadContainedConverters(NumberConverters.class);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/MiscTests.java Sat Apr 27 19:34:25 2019
@@ -45,6 +45,7 @@ public class MiscTests extends GenericTe
}
public static class ConverterLoaderImpl implements ConverterLoader {
+ @Override
public void loadConverters() {
throw new RuntimeException();
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/ComparableRange.java Sat Apr 27 19:34:25 2019
@@ -78,10 +78,12 @@ public class ComparableRange<T extends C
}
}
+ @Override
public int hashCode() {
return super.hashCode();
}
+ @Override
public int compareTo(ComparableRange<T> range) {
if (this == range) {
return 0;
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ClasspathLocationResolver.java Sat Apr 27 19:34:25 2019
@@ -29,6 +29,7 @@ import org.apache.ofbiz.base.util.UtilUR
*/
public class ClasspathLocationResolver implements LocationResolver {
+ @Override
public URL resolveLocation(String location) throws MalformedURLException {
return resolveLocation(location, null);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/ComponentLocationResolver.java Sat Apr 27 19:34:25 2019
@@ -37,6 +37,7 @@ public class ComponentLocationResolver i
public static final String module = ComponentLocationResolver.class.getName();
+ @Override
public URL resolveLocation(String location) throws MalformedURLException {
String baseLocation = getBaseLocation(location).toString();
if (File.separatorChar != '/') {
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/OFBizHomeLocationResolver.java Sat Apr 27 19:34:25 2019
@@ -33,6 +33,7 @@ public class OFBizHomeLocationResolver i
public static final String envName = "ofbiz.home";
+ @Override
public URL resolveLocation(String location) throws MalformedURLException {
String propValue = System.getProperty(envName);
if (propValue == null) {
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/StandardUrlLocationResolver.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/StandardUrlLocationResolver.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/StandardUrlLocationResolver.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/location/StandardUrlLocationResolver.java Sat Apr 27 19:34:25 2019
@@ -27,6 +27,7 @@ import java.net.URL;
*/
public class StandardUrlLocationResolver implements LocationResolver {
+ @Override
public URL resolveLocation(String location) throws MalformedURLException {
return new URL(location);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java Sat Apr 27 19:34:25 2019
@@ -43,6 +43,7 @@ public class AliasKeyManager implements
}
// this is where the customization comes in
+ @Override
public String chooseClientAlias(String[] keyTypes, Principal[] issuers, Socket socket) {
for (String keyType: keyTypes) {
String[] aliases = keyManager.getClientAliases(keyType, null); // ignoring the issuers
@@ -61,6 +62,7 @@ public class AliasKeyManager implements
}
// these just pass through the keyManager
+ @Override
public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket) {
return keyManager.chooseServerAlias(keyType, issuers, socket);
}
@@ -70,6 +72,7 @@ public class AliasKeyManager implements
return keyManager.chooseServerAlias(keyType, issuers, socket);
}
+ @Override
public X509Certificate[] getCertificateChain(String alias) {
X509Certificate[] certArray = keyManager.getCertificateChain(alias);
if (Debug.verboseOn()) {
@@ -78,10 +81,12 @@ public class AliasKeyManager implements
return certArray;
}
+ @Override
public String[] getClientAliases(String keyType, Principal[] issuers) {
return keyManager.getClientAliases(keyType, issuers);
}
+ @Override
public PrivateKey getPrivateKey(String alias) {
PrivateKey pk = keyManager.getPrivateKey(alias);
if (Debug.verboseOn()) {
@@ -90,6 +95,7 @@ public class AliasKeyManager implements
return pk;
}
+ @Override
public String[] getServerAliases(String keyType, Principal[] issuers) {
return keyManager.getServerAliases(keyType, issuers);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/MultiTrustManager.java Sat Apr 27 19:34:25 2019
@@ -58,6 +58,7 @@ public class MultiTrustManager implement
return keystores.size();
}
+ @Override
public void checkClientTrusted(X509Certificate[] certs, String alg) throws CertificateException {
if (isTrusted(certs)) {
return;
@@ -67,6 +68,7 @@ public class MultiTrustManager implement
}
}
+ @Override
public void checkServerTrusted(X509Certificate[] certs, String alg) throws CertificateException {
if (isTrusted(certs)) {
return;
@@ -76,6 +78,7 @@ public class MultiTrustManager implement
}
}
+ @Override
public X509Certificate[] getAcceptedIssuers() {
List<X509Certificate> issuers = new LinkedList<>();
for (KeyStore store: keystores) {
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/SSLUtil.java Sat Apr 27 19:34:25 2019
@@ -67,6 +67,7 @@ public final class SSLUtil {
private static class TrustAnyManager implements X509TrustManager {
+ @Override
public void checkClientTrusted(X509Certificate[] certs, String string) throws CertificateException {
Debug.logImportant("Trusting (un-trusted) client certificate chain:", module);
for (X509Certificate cert: certs) {
@@ -75,6 +76,7 @@ public final class SSLUtil {
}
}
+ @Override
public void checkServerTrusted(X509Certificate[] certs, String string) throws CertificateException {
Debug.logImportant("Trusting (un-trusted) server certificate chain:", module);
for (X509Certificate cert: certs) {
@@ -82,6 +84,7 @@ public final class SSLUtil {
}
}
+ @Override
public X509Certificate[] getAcceptedIssuers() {
return new X509Certificate[0];
}
@@ -246,6 +249,7 @@ public final class SSLUtil {
switch (level) {
case HOSTCERT_MIN_CHECK:
return new HostnameVerifier() {
+ @Override
public boolean verify(String hostname, SSLSession session) {
javax.security.cert.X509Certificate[] peerCerts;
try {
@@ -278,6 +282,7 @@ public final class SSLUtil {
};
case HOSTCERT_NO_CHECK:
return new HostnameVerifier() {
+ @Override
public boolean verify(String hostname, SSLSession session) {
return true;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ScriptUtil.java Sat Apr 27 19:34:25 2019
@@ -409,6 +409,7 @@ public final class ScriptUtil {
this.bindings = bindings;
this.protectedKeys = protectedKeys;
}
+ @Override
public void clear() {
for (String key : bindings.keySet()) {
if (!protectedKeys.contains(key)) {
@@ -416,12 +417,15 @@ public final class ScriptUtil {
}
}
}
+ @Override
public boolean containsKey(Object key) {
return bindings.containsKey(key);
}
+ @Override
public boolean containsValue(Object value) {
return bindings.containsValue(value);
}
+ @Override
public Set<java.util.Map.Entry<String, Object>> entrySet() {
return bindings.entrySet();
}
@@ -429,6 +433,7 @@ public final class ScriptUtil {
public boolean equals(Object o) {
return bindings.equals(o);
}
+ @Override
public Object get(Object key) {
return bindings.get(key);
}
@@ -436,12 +441,15 @@ public final class ScriptUtil {
public int hashCode() {
return bindings.hashCode();
}
+ @Override
public boolean isEmpty() {
return bindings.isEmpty();
}
+ @Override
public Set<String> keySet() {
return bindings.keySet();
}
+ @Override
public Object put(String key, Object value) {
Assert.notNull("key", key);
if (protectedKeys.contains(key)) {
@@ -451,6 +459,7 @@ public final class ScriptUtil {
}
return bindings.put(key, value);
}
+ @Override
public void putAll(Map<? extends String, ? extends Object> map) {
for (Map.Entry<? extends String, ? extends Object> entry : map.entrySet()) {
Assert.notNull("key", entry.getKey());
@@ -459,6 +468,7 @@ public final class ScriptUtil {
}
}
}
+ @Override
public Object remove(Object key) {
if (protectedKeys.contains(key)) {
UnsupportedOperationException e = new UnsupportedOperationException("Variable " + key + " is read-only");
@@ -467,9 +477,11 @@ public final class ScriptUtil {
}
return bindings.remove(key);
}
+ @Override
public int size() {
return bindings.size();
}
+ @Override
public Collection<Object> values() {
return bindings.values();
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/URLConnector.java Sat Apr 27 19:34:25 2019
@@ -112,6 +112,7 @@ public class URLConnector {
// special thread to open the connection
private class URLConnectorThread implements Runnable {
+ @Override
public void run() {
URLConnection con = null;
try {
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java Sat Apr 27 19:34:25 2019
@@ -75,6 +75,7 @@ public class UtilCodec {
public static class HtmlEncoder implements SimpleEncoder {
private static final char[] IMMUNE_HTML = {',', '.', '-', '_', ' '};
private HTMLEntityCodec htmlCodec = new HTMLEntityCodec();
+ @Override
public String encode(String original) {
if (original == null) {
return null;
@@ -84,10 +85,12 @@ public class UtilCodec {
/**
* @deprecated Use {@link #sanitize(String,String)} instead
*/
+ @Override
@Deprecated
public String sanitize(String original) {
return sanitize(original, null);
}
+ @Override
public String sanitize(String original, String contentTypeId) {
if (original == null) {
return null;
@@ -137,6 +140,7 @@ public class UtilCodec {
public static class XmlEncoder implements SimpleEncoder {
private static final char[] IMMUNE_XML = {',', '.', '-', '_', ' '};
private XMLEntityCodec xmlCodec = new XMLEntityCodec();
+ @Override
public String encode(String original) {
if (original == null) {
return null;
@@ -146,16 +150,19 @@ public class UtilCodec {
/**
* @deprecated Use {@link #sanitize(String,String)} instead
*/
+ @Override
@Deprecated
public String sanitize(String original) {
return sanitize(original, null);
}
+ @Override
public String sanitize(String original, String contentTypeId) {
return encode(original);
}
}
public static class UrlCodec implements SimpleEncoder, SimpleDecoder {
+ @Override
public String encode(String original) {
try {
return URLEncoder.encode(original, "UTF-8");
@@ -167,14 +174,17 @@ public class UtilCodec {
/**
* @deprecated Use {@link #sanitize(String,String)} instead
*/
+ @Override
@Deprecated
public String sanitize(String original) {
return sanitize(original, null);
}
+ @Override
public String sanitize(String original, String contentTypeId) {
return encode(original);
}
+ @Override
public String decode(String original) {
try {
canonicalize(original);
@@ -187,6 +197,7 @@ public class UtilCodec {
}
public static class StringEncoder implements SimpleEncoder {
+ @Override
public String encode(String original) {
if (original != null) {
original = original.replace("\"", "\\\"");
@@ -196,10 +207,12 @@ public class UtilCodec {
/**
* @deprecated Use {@link #sanitize(String,String)} instead
*/
+ @Override
@Deprecated
public String sanitize(String original) {
return sanitize(original, null);
}
+ @Override
public String sanitize(String original, String contentTypeId) {
return encode(original);
}
@@ -349,10 +362,15 @@ public class UtilCodec {
this.encoder = null;
}
+ @Override
public int size() { return this.internalMap.size(); }
+ @Override
public boolean isEmpty() { return this.internalMap.isEmpty(); }
+ @Override
public boolean containsKey(Object key) { return this.internalMap.containsKey(key); }
+ @Override
public boolean containsValue(Object value) { return this.internalMap.containsValue(value); }
+ @Override
public Object get(Object key) {
Object theObject = this.internalMap.get(key);
if (theObject instanceof String) {
@@ -365,12 +383,19 @@ public class UtilCodec {
}
return theObject;
}
+ @Override
public Object put(K key, Object value) { return this.internalMap.put(key, value); }
+ @Override
public Object remove(Object key) { return this.internalMap.remove(key); }
+ @Override
public void putAll(Map<? extends K, ? extends Object> arg0) { this.internalMap.putAll(arg0); }
+ @Override
public void clear() { this.internalMap.clear(); }
+ @Override
public Set<K> keySet() { return this.internalMap.keySet(); }
+ @Override
public Collection<Object> values() { return this.internalMap.values(); }
+ @Override
public Set<Map.Entry<K, Object>> entrySet() { return this.internalMap.entrySet(); }
@Override
public String toString() { return this.internalMap.toString(); }
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java Sat Apr 27 19:34:25 2019
@@ -1193,31 +1193,37 @@ public final class UtilDateTime {
return this;
}
+ @Override
@Deprecated
public void setYear(int year) {
throw new UnsupportedOperationException();
}
+ @Override
@Deprecated
public void setMonth(int month) {
throw new UnsupportedOperationException();
}
+ @Override
@Deprecated
public void setDate(int date) {
throw new UnsupportedOperationException();
}
+ @Override
@Deprecated
public void setHours(int hours) {
throw new UnsupportedOperationException();
}
+ @Override
@Deprecated
public void setMinutes(int minutes) {
throw new UnsupportedOperationException();
}
+ @Override
@Deprecated
public void setSeconds(int seconds) {
throw new UnsupportedOperationException();
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java Sat Apr 27 19:34:25 2019
@@ -1155,9 +1155,11 @@ public final class UtilProperties implem
public Enumeration<String> getKeys() {
return new Enumeration<String>() {
Iterator<String> i = UtilGenerics.cast(properties.keySet().iterator());
+ @Override
public boolean hasMoreElements() {
return (i.hasNext());
}
+ @Override
public String nextElement() {
return i.next();
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilXml.java Sat Apr 27 19:34:25 2019
@@ -1048,6 +1048,7 @@ public final class UtilXml {
* @param systemId - System ID of DTD
* @return InputSource of DTD
*/
+ @Override
public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException {
hasDTD = false;
String dtd = UtilProperties.getSplitPropertyValue(UtilURL.fromResource("localdtds.properties"), publicId);
@@ -1130,6 +1131,7 @@ public final class UtilXml {
this.localResolver = localResolver;
}
+ @Override
public void error(SAXParseException exception) {
String exceptionMessage = exception.getMessage();
Pattern valueFlexExpr = Pattern.compile("value '\\$\\{.*\\}'");
@@ -1145,6 +1147,7 @@ public final class UtilXml {
}
}
+ @Override
public void fatalError(SAXParseException exception) {
if (localResolver.hasDTD()) {
Debug.logError("XmlFileLoader: File "
@@ -1157,6 +1160,7 @@ public final class UtilXml {
}
}
+ @Override
public void warning(SAXParseException exception) {
if (localResolver.hasDTD()) {
Debug.logError("XmlFileLoader: File "
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/SoftRefCacheLine.java Sat Apr 27 19:34:25 2019
@@ -25,6 +25,7 @@ public abstract class SoftRefCacheLine<V
public SoftRefCacheLine(V value, long loadTimeNanos, long expireTimeNanos) {
super(loadTimeNanos, expireTimeNanos);
this.ref = new CacheSoftReference<V>(value) {
+ @Override
public void remove() {
SoftRefCacheLine.this.remove();
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/cache/test/UtilCacheTests.java Sat Apr 27 19:34:25 2019
@@ -131,14 +131,17 @@ public class UtilCacheTests extends Gene
changeSet.add(change);
}
+ @Override
public synchronized void noteKeyRemoval(UtilCache<K, V> cache, K key, V oldValue) {
add(key, new Removal<>(oldValue));
}
+ @Override
public synchronized void noteKeyAddition(UtilCache<K, V> cache, K key, V newValue) {
add(key, new Addition<>(newValue));
}
+ @Override
public synchronized void noteKeyUpdate(UtilCache<K, V> cache, K key, V newValue, V oldValue) {
add(key, new Update<>(newValue, oldValue));
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java Sat Apr 27 19:34:25 2019
@@ -113,6 +113,7 @@ public final class FlexibleMapAccessor<T
return this.isAscending;
}
+ @Override
public boolean isEmpty() {
return this.isEmpty;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java Sat Apr 27 19:34:25 2019
@@ -52,6 +52,7 @@ public abstract class GenericMap<K, V> i
modCountUpdater.getAndIncrement(this);
}
+ @Override
public final void clear() {
if (isEmpty()) {
return;
@@ -62,6 +63,7 @@ public abstract class GenericMap<K, V> i
protected abstract void clearInternal();
+ @Override
public boolean containsValue(Object value) {
return values().contains(value);
}
@@ -135,6 +137,7 @@ public abstract class GenericMap<K, V> i
return true;
}
+ @Override
public final V get(Object key) {
return get(key, true);
}
@@ -156,6 +159,7 @@ public abstract class GenericMap<K, V> i
}
}
+ @Override
public final Set<Map.Entry<K, V>> entrySet() {
if (entrySet == null) {
entrySetUpdater.compareAndSet(this, null, new GenericMapEntrySet<K, V, GenericMap<K, V>>(this) {
@@ -185,9 +189,11 @@ public abstract class GenericMap<K, V> i
protected abstract Iterator<Map.Entry<K, V>> iterator(boolean noteAccess);
+ @Override
public final Set<K> keySet() {
if (keySet == null) {
keySetUpdater.compareAndSet(this, null, new GenericMapKeySet<K, V, GenericMap<K, V>>(this) {
+ @Override
public boolean contains(Object key) {
return containsKey(key);
}
@@ -211,6 +217,7 @@ public abstract class GenericMap<K, V> i
return keySet;
}
+ @Override
public final Collection<V> values() {
if (values == null) {
valuesUpdater.compareAndSet(this, null, new GenericMapValues<K, V, GenericMap<K, V>>(this) {
@@ -233,12 +240,14 @@ public abstract class GenericMap<K, V> i
return values;
}
+ @Override
public final V remove(Object key) {
return removeInternal(key, true);
}
protected abstract V removeInternal(Object key, boolean incrementModCount);
+ @Override
public final void putAll(Map<? extends K, ? extends V> map) {
putAllInternal(map);
}
@@ -265,6 +274,7 @@ public abstract class GenericMap<K, V> i
return appendTo(new StringBuilder()).toString();
}
+ @Override
public StringBuilder appendTo(StringBuilder sb) {
sb.append("{");
Iterator<Map.Entry<K, V>> it = iterator(false);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapCollection.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapCollection.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapCollection.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapCollection.java Sat Apr 27 19:34:25 2019
@@ -31,18 +31,22 @@ public abstract class GenericMapCollecti
this.source = source;
}
+ @Override
public boolean add(I item) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(Collection<? extends I> collection) {
throw new UnsupportedOperationException();
}
+ @Override
public void clear() {
source.clear();
}
+ @Override
public boolean containsAll(Collection<?> collection) {
for (Object item: collection) {
if (!contains(item)) {
@@ -52,16 +56,19 @@ public abstract class GenericMapCollecti
return true;
}
+ @Override
public boolean isEmpty() {
return source.isEmpty();
}
+ @Override
public final Iterator<I> iterator() {
return iterator(true);
}
protected abstract Iterator<I> iterator(boolean noteAccess);
+ @Override
public boolean removeAll(Collection<?> collection) {
int count = 0;
for (Object item: collection) {
@@ -72,6 +79,7 @@ public abstract class GenericMapCollecti
return count > 0;
}
+ @Override
public boolean retainAll(Collection<?> collection) {
int count = 0;
Iterator<I> it = iterator(false);
@@ -85,10 +93,12 @@ public abstract class GenericMapCollecti
return count > 0;
}
+ @Override
public int size() {
return source.size();
}
+ @Override
public Object[] toArray() {
List<I> list = new LinkedList<>();
Iterator<I> it = iterator(false);
@@ -98,6 +108,7 @@ public abstract class GenericMapCollecti
return list.toArray();
}
+ @Override
public <T> T[] toArray(T[] array) {
List<Object> list = new LinkedList<>();
Iterator<I> it = iterator(false);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntry.java Sat Apr 27 19:34:25 2019
@@ -33,14 +33,17 @@ public class GenericMapEntry<K, V> imple
this.noteAccess = noteAccess;
}
+ @Override
public K getKey() {
return key;
}
+ @Override
public V getValue() {
return map.get(key, noteAccess);
}
+ @Override
public V setValue(V value) {
return map.put(key, value);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapEntrySet.java Sat Apr 27 19:34:25 2019
@@ -25,6 +25,7 @@ public abstract class GenericMapEntrySet
super(source);
}
+ @Override
public boolean contains(Object item) {
if (item == null) {
return false;
@@ -38,6 +39,7 @@ public abstract class GenericMapEntrySet
protected abstract boolean contains(Object key, Object value);
+ @Override
public boolean remove(Object item) {
if (item == null) {
return false;
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapKeySet.java Sat Apr 27 19:34:25 2019
@@ -25,6 +25,7 @@ public abstract class GenericMapKeySet<K
super(source);
}
+ @Override
public boolean remove(Object item) {
return source.remove(item) != null;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMapValues.java Sat Apr 27 19:34:25 2019
@@ -31,6 +31,7 @@ public abstract class GenericMapValues<K
super(source);
}
+ @Override
public boolean contains(Object item) {
Iterator<V> it = iterator(false);
while (it.hasNext()) {
@@ -77,6 +78,7 @@ public abstract class GenericMapValues<K
return h;
}
+ @Override
public boolean remove(Object item) {
Iterator<V> it = iterator(false);
while (it.hasNext()) {
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/IteratorWrapper.java Sat Apr 27 19:34:25 2019
@@ -31,6 +31,7 @@ public abstract class IteratorWrapper<DE
this.it = it;
}
+ @Override
public boolean hasNext() {
if (nextCalled) {
return true;
@@ -50,6 +51,7 @@ public abstract class IteratorWrapper<DE
return false;
}
+ @Override
public DEST next() {
if (!nextCalled) {
if (!hasNext()) {
@@ -60,6 +62,7 @@ public abstract class IteratorWrapper<DE
return lastDest;
}
+ @Override
public void remove() {
if (lastSrc != null) {
noteRemoval(lastDest, lastSrc);
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/MapComparator.java Sat Apr 27 19:34:25 2019
@@ -54,13 +54,12 @@ public class MapComparator implements Co
return obj.equals(this);
}
+ @Override
public int hashCode() {
return super.hashCode();
}
- /**
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
+ @Override
public int compare(Map<Object, Object> map1, Map<Object, Object> map2) {
if (keys == null || keys.size() < 1) {
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ReadOnlyMapEntry.java Sat Apr 27 19:34:25 2019
@@ -34,14 +34,17 @@ public class ReadOnlyMapEntry<K, V> impl
this.value = value;
}
+ @Override
public K getKey() {
return key;
}
+ @Override
public V getValue() {
return value;
}
+ @Override
public V setValue(V value) {
throw new UnsupportedOperationException();
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/ResourceBundleMapWrapper.java Sat Apr 27 19:34:25 2019
@@ -105,18 +105,23 @@ public class ResourceBundleMapWrapper im
return this.initialResourceBundle;
}
+ @Override
public void clear() {
this.rbmwStack.clear();
}
+ @Override
public boolean containsKey(Object arg0) {
return this.rbmwStack.containsKey(arg0);
}
+ @Override
public boolean containsValue(Object arg0) {
return this.rbmwStack.containsValue(arg0);
}
+ @Override
public Set<Map.Entry<String, Object>> entrySet() {
return this.rbmwStack.entrySet();
}
+ @Override
public Object get(Object arg0) {
Object value = this.rbmwStack.get(arg0);
if (value == null) {
@@ -131,24 +136,31 @@ public class ResourceBundleMapWrapper im
}
return value;
}
+ @Override
public boolean isEmpty() {
return this.rbmwStack.isEmpty();
}
+ @Override
public Set<String> keySet() {
return this.rbmwStack.keySet();
}
+ @Override
public Object put(String key, Object value) {
return this.rbmwStack.put(key, value);
}
+ @Override
public void putAll(Map<? extends String, ? extends Object> arg0) {
this.rbmwStack.putAll(arg0);
}
+ @Override
public Object remove(Object arg0) {
return this.rbmwStack.remove(arg0);
}
+ @Override
public int size() {
return this.rbmwStack.size();
}
+ @Override
public Collection<Object> values() {
return this.rbmwStack.values();
}
@@ -189,10 +201,7 @@ public class ResourceBundleMapWrapper im
isMapInitialized = true;
}
-
- /* (non-Javadoc)
- * @see java.util.Map#size()
- */
+ @Override
public int size() {
if(isMapInitialized) {
// this is an approximate size, won't include elements from parent bundles
@@ -201,9 +210,7 @@ public class ResourceBundleMapWrapper im
return resourceBundle.keySet().size();
}
- /* (non-Javadoc)
- * @see java.util.Map#isEmpty()
- */
+ @Override
public boolean isEmpty() {
if (isMapInitialized) {
return topLevelMap.isEmpty();
@@ -211,9 +218,7 @@ public class ResourceBundleMapWrapper im
return resourceBundle.keySet().size() == 0;
}
- /* (non-Javadoc)
- * @see java.util.Map#containsKey(java.lang.Object)
- */
+ @Override
public boolean containsKey(Object arg0) {
if (isMapInitialized) {
if (topLevelMap.containsKey(arg0)) {
@@ -235,16 +240,12 @@ public class ResourceBundleMapWrapper im
return false;
}
- /* (non-Javadoc)
- * @see java.util.Map#containsValue(java.lang.Object)
- */
+ @Override
public boolean containsValue(Object arg0) {
throw new RuntimeException("Not implemented for ResourceBundleMapWrapper");
}
- /* (non-Javadoc)
- * @see java.util.Map#get(java.lang.Object)
- */
+ @Override
public Object get(Object arg0) {
Object value = null;
if(isMapInitialized) {
@@ -264,53 +265,39 @@ public class ResourceBundleMapWrapper im
return value;
}
- /* (non-Javadoc)
- * @see java.util.Map#put(java.lang.Object, java.lang.Object)
- */
+ @Override
public Object put(String arg0, Object arg1) {
throw new RuntimeException("Not implemented/allowed for ResourceBundleMapWrapper");
}
- /* (non-Javadoc)
- * @see java.util.Map#remove(java.lang.Object)
- */
+ @Override
public Object remove(Object arg0) {
throw new RuntimeException("Not implemented for ResourceBundleMapWrapper");
}
- /* (non-Javadoc)
- * @see java.util.Map#putAll(java.util.Map)
- */
+ @Override
public void putAll(Map<? extends String, ? extends Object> arg0) {
throw new RuntimeException("Not implemented for ResourceBundleMapWrapper");
}
- /* (non-Javadoc)
- * @see java.util.Map#clear()
- */
+ @Override
public void clear() {
throw new RuntimeException("Not implemented for ResourceBundleMapWrapper");
}
- /* (non-Javadoc)
- * @see java.util.Map#keySet()
- */
+ @Override
public Set<String> keySet() {
createMapWhenNeeded();
return this.topLevelMap.keySet();
}
- /* (non-Javadoc)
- * @see java.util.Map#values()
- */
+ @Override
public Collection<Object> values() {
createMapWhenNeeded();
return this.topLevelMap.values();
}
- /* (non-Javadoc)
- * @see java.util.Map#entrySet()
- */
+ @Override
public Set<Map.Entry<String, Object>> entrySet() {
createMapWhenNeeded();
return this.topLevelMap.entrySet();
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/GenericMapTest.java Sat Apr 27 19:34:25 2019
@@ -86,6 +86,7 @@ public class GenericMapTest extends Gene
proxyMap.clear();
}
+ @Override
public boolean containsKey(Object key) {
incrementCallCount("containsKey");
return proxyMap.containsKey(key);
@@ -97,6 +98,7 @@ public class GenericMapTest extends Gene
return proxyMap.get(key);
}
+ @Override
public boolean isEmpty() {
incrementCallCount("isEmpty");
return proxyMap.isEmpty();
@@ -116,6 +118,7 @@ public class GenericMapTest extends Gene
};
}
+ @Override
public V put(K key, V value) {
incrementCallCount("putInternal");
if (!proxyMap.containsKey(key)) incrementModCount();
@@ -139,6 +142,7 @@ public class GenericMapTest extends Gene
return proxyMap.remove(key);
}
+ @Override
public int size() {
incrementCallCount("size");
return proxyMap.size();
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/FlexibleStringExpander.java Sat Apr 27 19:34:25 2019
@@ -503,6 +503,7 @@ public abstract class FlexibleStringExpa
* @return <code>true</code> if the original expression is empty
* or <code>null</code>
*/
+ @Override
public abstract boolean isEmpty();
/** Returns a copy of the original expression.
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java Sat Apr 27 19:34:25 2019
@@ -241,6 +241,7 @@ public class FlexibleStringExpanderTests
super(SpecialNumber.class, String.class);
}
+ @Override
public String convert(SpecialNumber obj) throws ConversionException {
throw new NullPointerException();
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/ReferenceCleanerTests.java Sat Apr 27 19:34:25 2019
@@ -37,18 +37,21 @@ public class ReferenceCleanerTests exten
final SynchronousQueue<String> queue = new SynchronousQueue<>();
Object obj = new Object();
ReferenceCleaner.Soft<Object> soft = new ReferenceCleaner.Soft<Object>(obj) {
+ @Override
public void remove() throws Exception {
queue.put("soft");
Thread.currentThread().interrupt();
}
};
ReferenceCleaner.Weak<Object> weak = new ReferenceCleaner.Weak<Object>(obj) {
+ @Override
public void remove() throws Exception {
queue.put("weak");
throw new RuntimeException();
}
};
new ReferenceCleaner.Phantom<Object>(obj) {
+ @Override
public void remove() throws Exception {
queue.put("phantom");
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java Sat Apr 27 19:34:25 2019
@@ -289,6 +289,7 @@ public class StringUtilTests extends Gen
this.s = s;
}
+ @Override
public StringBuilder appendTo(StringBuilder sb) {
return sb.append(s);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/UtilObjectTests.java Sat Apr 27 19:34:25 2019
@@ -293,6 +293,7 @@ public class UtilObjectTests extends Gen
}
public static class FirstTestFactory implements TestFactoryIntf {
+ @Override
public Object getInstance(Set<String> set) {
if (!set.contains("first")) return null;
if (set.contains("one")) return "ONE";
@@ -303,6 +304,7 @@ public class UtilObjectTests extends Gen
}
public static class SecondTestFactory implements TestFactoryIntf {
+ @Override
public Object getInstance(Set<String> set) {
if (!set.contains("second")) return null;
if (set.contains("ONE")) return "1";
Modified: ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java Sat Apr 27 19:34:25 2019
@@ -132,6 +132,7 @@ public class CatalinaContainer implement
loadWebapps(tomcat, configuration, clusterProps);
}
+ @Override
public boolean start() throws ContainerException {
try {
tomcat.start();
@@ -147,6 +148,7 @@ public class CatalinaContainer implement
return true;
}
+ @Override
public void stop() {
try {
tomcat.stop();
@@ -157,6 +159,7 @@ public class CatalinaContainer implement
}
}
+ @Override
public String getName() {
return name;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java Sat Apr 27 19:34:25 2019
@@ -132,6 +132,7 @@ public final class AuthHelper {
private static ClassLoader getContextClassLoader() {
return AccessController.doPrivileged(
new PrivilegedAction<ClassLoader>() {
+ @Override
public ClassLoader run() {
ClassLoader cl = null;
try {
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java Sat Apr 27 19:34:25 2019
@@ -64,6 +64,7 @@ public class AuthenticationComparator im
* @throws ClassCastException if the arguments' types prevent them from
* being compared by this Comparator.
*/
+ @Override
public int compare(Authenticator a1, Authenticator a2) {
int comp = Float.compare(a1.getWeight(), a2.getWeight());
if (comp != 0) {
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java Sat Apr 27 19:34:25 2019
@@ -41,6 +41,7 @@ public class TestFailAuthenticator imple
*
* @param dispatcher The LocalDispatcher to use for this Authenticator
*/
+ @Override
public void initialize(LocalDispatcher dispatcher) {
this.dispatcher = dispatcher;
this.delegator = dispatcher.getDelegator();
@@ -57,6 +58,7 @@ public class TestFailAuthenticator imple
* @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
* when a fatal error occurs during authentication
*/
+ @Override
public boolean authenticate(String username, String password, boolean isServiceAuth) throws AuthenticatorException {
Debug.logInfo(this.getClass().getName() + " Authenticator authenticate() -- returning false", module);
return false;
@@ -69,6 +71,7 @@ public class TestFailAuthenticator imple
* @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
* when logout fails
*/
+ @Override
public void logout(String username) throws AuthenticatorException {
Debug.logInfo(this.getClass().getName() + " Authenticator logout()", module);
}
@@ -80,6 +83,7 @@ public class TestFailAuthenticator imple
* @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
* user synchronization fails
*/
+ @Override
public void syncUser(String username) throws AuthenticatorException {
Debug.logInfo(this.getClass().getName() + " Authenticator syncUser()", module);
// no user info to sync
@@ -94,6 +98,7 @@ public class TestFailAuthenticator imple
* @throws org.apache.ofbiz.common.authentication.api.AuthenticatorException
* when update password fails
*/
+ @Override
public void updatePassword(String username, String password, String newPassword) throws AuthenticatorException {
Debug.logInfo(this.getClass().getName() + " Authenticator updatePassword()", module);
}
@@ -103,6 +108,7 @@ public class TestFailAuthenticator imple
*
* @return the weight of this Authenticator
*/
+ @Override
public float getWeight() {
return 1;
}
@@ -112,6 +118,7 @@ public class TestFailAuthenticator imple
*
* @return true if the user record is copied to the OFB database
*/
+ @Override
public boolean isUserSynchronized() {
Debug.logInfo(this.getClass().getName() + " Authenticator isUserSynchronized()", module);
return true;
@@ -122,6 +129,7 @@ public class TestFailAuthenticator imple
*
* @return true if this is expected to be the only Authenticator
*/
+ @Override
public boolean isSingleAuthenticator() {
Debug.logInfo(this.getClass().getName() + " Authenticator isSingleAuthenticator()", module);
return false;
@@ -132,6 +140,7 @@ public class TestFailAuthenticator imple
*
* @return true if the Authenticator is enabled
*/
+ @Override
public boolean isEnabled() {
return false;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java Sat Apr 27 19:34:25 2019
@@ -716,18 +716,22 @@ public class EmailServices {
contentArray.close();
}
+ @Override
public String getContentType() {
return contentType == null ? "application/octet-stream" : contentType;
}
+ @Override
public InputStream getInputStream() throws IOException {
return new ByteArrayInputStream(contentArray.toByteArray());
}
+ @Override
public String getName() {
return "stringDatasource";
}
+ @Override
public OutputStream getOutputStream() throws IOException {
throw new IOException("Cannot write to this read-only resource");
}
@@ -743,18 +747,22 @@ public class EmailServices {
this.contentArray = content.clone();
}
+ @Override
public String getContentType() {
return contentType == null ? "application/octet-stream" : contentType;
}
+ @Override
public InputStream getInputStream() {
return new ByteArrayInputStream(contentArray);
}
+ @Override
public String getName() {
return "ByteArrayDataSource";
}
+ @Override
public OutputStream getOutputStream() throws IOException {
throw new IOException("Cannot write to this read-only resource");
}
Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ScriptHelperImpl.java Sat Apr 27 19:34:25 2019
@@ -114,6 +114,7 @@ public final class ScriptHelperImpl impl
this.ctxHelper = new ContextHelper(context);
}
+ @Override
public Map<String, ? extends Object> createServiceMap(String serviceName, Map<String, ? extends Object> inputMap) throws ScriptException {
Assert.notNull("serviceName", serviceName, "inputMap", inputMap);
Map<String, Object> toMap = new HashMap<>();
@@ -154,6 +155,7 @@ public final class ScriptHelperImpl impl
}
}
+ @Override
public List<Map<String, Object>> findList(String entityName, Map<String, ? extends Object> fields) throws ScriptException {
try {
return UtilGenerics.checkList(ctxHelper.getDelegator().findByAnd(entityName, fields, null, false));
@@ -164,10 +166,12 @@ public final class ScriptHelperImpl impl
}
}
+ @Override
public Map<String, Object> findOne(String entityName) throws ScriptException {
return findOne(entityName, null, EMPTY_ARGS);
}
+ @Override
public Map<String, Object> findOne(String entityName, Map<String, ? extends Object> fields, Map<String, ? extends Object> args) throws ScriptException {
Assert.notNull("entityName", entityName);
if (args == null) {
@@ -183,33 +187,40 @@ public final class ScriptHelperImpl impl
return runFindByPrimaryKey(modelEntity, ctxHelper, useCache, autoFieldMap, fields, selectFieldList);
}
+ @Override
public void logError(String message) {
String expandedMessage = ctxHelper.expandString(message);
Debug.logError("[".concat(ctxHelper.getScriptName()).concat("] ").concat(expandedMessage), module);
}
+ @Override
public void logInfo(String message) {
String expandedMessage = ctxHelper.expandString(message);
Debug.logInfo("[".concat(ctxHelper.getScriptName()).concat("] ").concat(expandedMessage), module);
}
+ @Override
public void logWarning(String message) {
String expandedMessage = ctxHelper.expandString(message);
Debug.logWarning("[".concat(ctxHelper.getScriptName()).concat("] ").concat(expandedMessage), module);
}
+ @Override
public Map<String, Object> makeValue(String entityName) throws ScriptException {
return ctxHelper.getDelegator().makeValidValue(entityName);
}
+ @Override
public Map<String, Object> makeValue(String entityName, Map<String, Object> fields) throws ScriptException {
return ctxHelper.getDelegator().makeValidValue(entityName, fields);
}
+ @Override
public Map<String, ? extends Object> runService(String serviceName, Map<String, ? extends Object> inputMap) throws ScriptException {
return runService(serviceName, inputMap, EMPTY_ARGS);
}
+ @Override
public Map<String, ? extends Object> runService(String serviceName, Map<String, ? extends Object> inputMap, Map<String, ? extends Object> args) throws ScriptException {
Assert.notNull("serviceName", serviceName, "args", args);
boolean includeUserLogin = !"false".equals(args.get("includeUserLoginStr"));
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java Sat Apr 27 19:34:25 2019
@@ -71,6 +71,7 @@ public abstract class DelegatorFactory i
this.delegatorName = delegatorName;
}
+ @Override
public Delegator call() throws ClassNotFoundException {
try {
Delegator delegator = UtilObject.getObjectFromFactory(DelegatorFactory.class, delegatorName);
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactoryImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactoryImpl.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactoryImpl.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactoryImpl.java Sat Apr 27 19:34:25 2019
@@ -27,6 +27,7 @@ public class DelegatorFactoryImpl extend
public static final String module = DelegatorFactoryImpl.class.getName();
// TODO: this method should propagate the GenericEntityException
+ @Override
public Delegator getInstance(String delegatorName) {
if (Debug.infoOn()) {
Debug.logInfo("Creating new delegator [" + delegatorName + "] (" + Thread.currentThread().getName() + ")", module);
Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java?rev=1858295&r1=1858294&r2=1858295&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java Sat Apr 27 19:34:25 2019
@@ -2223,17 +2223,12 @@ public class GenericDelegator implements
return nextSeqLong.toString();
}
- /* (non-Javadoc)
- * @see org.apache.ofbiz.entity.Delegator#getNextSeqIdLong(java.lang.String)
- */
@Override
public Long getNextSeqIdLong(String seqName) {
return this.getNextSeqIdLong(seqName, 1);
}
- /* (non-Javadoc)
- * @see org.apache.ofbiz.entity.Delegator#getNextSeqIdLong(java.lang.String, long)
- */
+ @Override
public Long getNextSeqIdLong(String seqName, long staggerMax) {
try {
SequenceUtil sequencer = this.AtomicRefSequencer.get();