Skip to content

TRUNK-6583: Fix Sonar issue: added since attribute to Deprecated annotation #5927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kapil-kundu wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −17
Open

TRUNK-6583: Fix Sonar issue: added since attribute to Deprecated annotation #5927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/src/main/java/org/openmrs/Allergy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public void setSeverity(Concept severity) {
* @return Returns the comment
* @deprecated as of 2.3.0, replaced by {@link #getComments()}
*/
@Deprecated
@Deprecated(since = "2.3.0", forRemoval = true)
public String getComment() {
return getComments();
}
Expand All @@ -203,7 +203,7 @@ public String getComment() {
* @param comment the comment to set
* @deprecated as of 2.3.0, replaced by {@link #setComments(String)}
*/
@Deprecated
@Deprecated(since = "2.3.0", forRemoval = true)
public void setComment(String comment) {
setComments(comment);
}
Expand Down
10 changes: 5 additions & 5 deletions api/src/main/java/org/openmrs/BaseOpenmrsData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void setDateCreated(Date dateCreated) {
* @see org.openmrs.OpenmrsData#getChangedBy()
*/
@Override
@Deprecated
@Deprecated(since = "2.2", forRemoval = true)
public User getChangedBy() {
return changedBy;
}
Expand All @@ -118,7 +118,7 @@ public User getChangedBy() {
* @see org.openmrs.OpenmrsData#setChangedBy(User)
*/
@Override
@Deprecated
@Deprecated(since = "2.2", forRemoval = true)
public void setChangedBy(User changedBy) {
this.changedBy = changedBy;
}
Expand All @@ -128,7 +128,7 @@ public void setChangedBy(User changedBy) {
* @see org.openmrs.OpenmrsData#getDateChanged()
*/
@Override
@Deprecated
@Deprecated(since = "2.2", forRemoval = true)
public Date getDateChanged() {
return dateChanged;
}
Expand All @@ -138,7 +138,7 @@ public Date getDateChanged() {
* @see org.openmrs.OpenmrsData#setDateChanged(Date)
*/
@Override
@Deprecated
@Deprecated(since = "2.2", forRemoval = true)
public void setDateChanged(Date dateChanged) {
this.dateChanged = dateChanged;
}
Expand All @@ -148,7 +148,7 @@ public void setDateChanged(Date dateChanged) {
* @see org.openmrs.Voidable#isVoided()
*/
@Override
@Deprecated
@Deprecated(since = "2.0", forRemoval = true)
public Boolean isVoided() {
return getVoided();
}
Expand Down
10 changes: 5 additions & 5 deletions api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public void setDateCreated(Date dateCreated) {
* @deprecated as of version 2.2
*/
@Override
@Deprecated
@Deprecated(since = "2.2", forRemoval = true)
public User getChangedBy() {
return changedBy;
}
Expand All @@ -160,7 +160,7 @@ public User getChangedBy() {
* @deprecated as of version 2.2
*/
@Override
@Deprecated
@Deprecated(since = "2.2", forRemoval = true)
public void setChangedBy(User changedBy) {
this.changedBy = changedBy;
}
Expand All @@ -170,7 +170,7 @@ public void setChangedBy(User changedBy) {
* @deprecated as of version 2.2
*/
@Override
@Deprecated
@Deprecated(since = "2.2", forRemoval = true)
public Date getDateChanged() {
return dateChanged;
}
Expand All @@ -180,7 +180,7 @@ public Date getDateChanged() {
* @deprecated as of version 2.2
*/
@Override
@Deprecated
@Deprecated(since = "2.2", forRemoval = true)
public void setDateChanged(Date dateChanged) {
this.dateChanged = dateChanged;
}
Expand All @@ -190,7 +190,7 @@ public void setDateChanged(Date dateChanged) {
* @see org.openmrs.Retireable#isRetired()
*/
@Override
@Deprecated
@Deprecated(since = "2.0", forRemoval = true)
public Boolean isRetired() {
return getRetired();
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/org/openmrs/ConceptName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public void setDateCreated(Date dateCreated) {
* @deprecated as of 2.0, use {@link #getVoided()}
*/
@Override
@Deprecated
@Deprecated(since = "2.0", forRemoval = true)
@JsonIgnore
public Boolean isVoided() {
return getVoided();
Expand Down Expand Up @@ -347,7 +347,7 @@ public void setConceptNameType(ConceptNameType conceptNameType) {
* @return localPreferred
* @deprecated as of 2.0, use {@link #getLocalePreferred()}
*/
@Deprecated
@Deprecated(since = "2.0", forRemoval = true)
@JsonIgnore
public Boolean isLocalePreferred() {
return getLocalePreferred();
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/ConceptNameTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public void setDateCreated(Date dateCreated) {
* @deprecated as of 2.0, use {@link #getVoided()}
*/
@Override
@Deprecated
@Deprecated(since = "2.0", forRemoval = true)
@JsonIgnore
public Boolean isVoided() {
return getVoided();
Expand Down
2 changes: 2 additions & 0 deletions api/src/main/java/org/openmrs/aop/AOPConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public class AOPConfig {
* @deprecated since 3.0.0 use {@link Service} annotation instead
*/
@Bean
@Deprecated(since = "3.0.0", forRemoval = true)
public List<Advice> serviceInterceptors(AuthorizationAdvice authorizationAdvice, LoggingAdvice loggingAdvice,
RequiredDataAdvice requiredDataAdvice, CacheInterceptor cacheInterceptor) {
List<Advice> interceptors = new ArrayList<>();
Expand All @@ -90,6 +91,7 @@ public List<Advice> serviceInterceptors(AuthorizationAdvice authorizationAdvice,
* @deprecated since 3.0.0 use {@link Service} annotation instead
*/
@Bean
@Deprecated(since = "3.0.0", forRemoval = true)
public TransactionAttributeSource transactionAttributeSource() {
return new AnnotationTransactionAttributeSource();
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ public void before(Method method, Object[] args, Object target) throws Throwable
// if a second argument exists, pass that to the save handler as well
// (with current code, it means we're either in an obs save or a user save)
String other = null;
if (args.length > 1 && args[1] instanceof String) {
other = (String) args[1];
if (args.length > 1 && args[1] instanceof String string) {
other = string;
}

recursivelyHandle(SaveHandler.class, (OpenmrsObject) mainArgument, other);
Expand Down