Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid creation of unused logger instance in AbstractMediaTypeExpression

Browse Source 
Closes gh-25901
This commit is contained in:
Juergen Hoeller
2020-10-13 01:20:34 +02:00
parent bacf6ca37b
commit 678ea4ece7
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractMediaTypeExpression.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
package org.springframework.web.servlet.mvc.condition; package org.springframework.web.servlet.mvc.condition;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,8 +29,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
*/ */
abstract class AbstractMediaTypeExpression implements MediaTypeExpression, Comparable<AbstractMediaTypeExpression> { abstract class AbstractMediaTypeExpression implements MediaTypeExpression, Comparable<AbstractMediaTypeExpression> {
protected final Log logger = LogFactory.getLog(getClass());
private final MediaType mediaType; private final MediaType mediaType;
private final boolean isNegated; private final boolean isNegated;
@@ -73,15 +68,15 @@ abstract class AbstractMediaTypeExpression implements MediaTypeExpression, Compa
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object other) {
if (this == obj) { if (this == other) {
return true; return true;
} }
if (obj != null && getClass() == obj.getClass()) { if (other == null || getClass() != other.getClass()) {
AbstractMediaTypeExpression other = (AbstractMediaTypeExpression) obj; return false;
return (this.mediaType.equals(other.mediaType) && this.isNegated == other.isNegated);
} }
return false; AbstractMediaTypeExpression otherExpr = (AbstractMediaTypeExpression) other;
return (this.mediaType.equals(otherExpr.mediaType) && this.isNegated == otherExpr.isNegated);
} }
@Override @Override
@@ -91,12 +86,10 @@ abstract class AbstractMediaTypeExpression implements MediaTypeExpression, Compa
@Override @Override
public String toString() { public String toString() {
StringBuilder builder = new StringBuilder();
if (this.isNegated) { if (this.isNegated) {
builder.append('!'); return '!' + this.mediaType.toString();
} }
builder.append(this.mediaType.toString()); return this.mediaType.toString();
return builder.toString();
} }
} }