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

RequireThis rule and fixThis Gradle task

Browse Source 
* `gradlew clean check -x test --parallel --continue` - to collect reports
* `gradlew fixThis --parallel` - to fix all possible vulnerabilities. With `-Dfile.encoding=UTF-8` on Windows

Since the `RequireThisCheck` doesn't see parents for anonymous classes (e.g. `Runnable` callback), its report doesn't contains the outer class name with `this.`,
therefore we still have to fix those cases manually.
Thanks to the wrong `replacer` just with `this.` we have uncompilable code enough easy to find problems.
Not so easy to fix for good readability though...

* Upgrade to Grade 2.12
* Upgrade to SonarQube native plugin

The fix contains at about 300 files. So, will be done on merge.

Fix `fixThis.gradle` according PR comments

Apply `fixThis` and also `fixModifiers` for test classes.
 Fix some `this.` inner issues manually.
 Make code polishing for long lines after `fixThis`

Fix conflicts and vulnerabilities after the rebase
This commit is contained in:
Artem Bilan
2016-03-17 17:02:15 -04:00
parent e189307ab6
commit 2b0598291c
348 changed files with 1828 additions and 1781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -201,7 +201,7 @@ public abstract class AbstractConfigurableMongoDbMessageStore extends AbstractBa
? System.currentTimeMillis()
: document.getCreatedTime();
Message<?> result = messageBuilderFactory.fromMessage(message).setHeader(SAVED_KEY, Boolean.TRUE)
Message<?> result = this.messageBuilderFactory.fromMessage(message).setHeader(SAVED_KEY, Boolean.TRUE)
.setHeader(CREATED_DATE_KEY, createdDate).build();
@SuppressWarnings("unchecked")
@@ -212,7 +212,7 @@ public abstract class AbstractConfigurableMongoDbMessageStore extends AbstractBa
innerMap.put(MessageHeaders.TIMESTAMP, message.getHeaders().get(MessageHeaders.TIMESTAMP));
document.setCreatedTime(createdDate);
mongoTemplate.insert(document, collectionName);
this.mongoTemplate.insert(document, this.collectionName);
}
protected static Query groupIdQuery(Object groupId) {
@@ -241,10 +241,10 @@ public abstract class AbstractConfigurableMongoDbMessageStore extends AbstractBa
@Override
public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
if (Message.class.isAssignableFrom(sourceType.getObjectType())) {
return serializingConverter.convert(source);
return this.serializingConverter.convert(source);
}
else {
return deserializingConverter.convert((byte[]) source);
return this.deserializingConverter.convert((byte[]) source);
}
}

6
spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/ConfigurableMongoDbMessageStore.java
View File

@@ -99,7 +99,7 @@ public class ConfigurableMongoDbMessageStore extends AbstractConfigurableMongoDb
}
public boolean isTimeoutOnIdle() {
return timeoutOnIdle;
return this.timeoutOnIdle;
}
/**
@@ -286,7 +286,7 @@ public class ConfigurableMongoDbMessageStore extends AbstractConfigurableMongoDb
@Override
public void registerMessageGroupExpiryCallback(MessageGroupCallback callback) {
expiryCallbacks.add(callback);
this.expiryCallbacks.add(callback);
}
@Override
@@ -342,7 +342,7 @@ public class ConfigurableMongoDbMessageStore extends AbstractConfigurableMongoDb
RuntimeException exception = null;
for (MessageGroupCallback callback : expiryCallbacks) {
for (MessageGroupCallback callback : this.expiryCallbacks) {
try {
callback.execute(this, group);
}

12
spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MessageDocument.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ public class MessageDocument {
}
public Message<?> getMessage() {
return message;
return this.message;
}
public void setGroupId(Object groupId) {
@@ -82,7 +82,7 @@ public class MessageDocument {
}
public Long getLastModifiedTime() {
return lastModifiedTime;
return this.lastModifiedTime;
}
public void setLastModifiedTime(long lastModifiedTime) {
@@ -90,7 +90,7 @@ public class MessageDocument {
}
public Long getCreatedTime() {
return createdTime;
return this.createdTime;
}
public void setCreatedTime(long createdTime) {
@@ -98,7 +98,7 @@ public class MessageDocument {
}
public Boolean isComplete() {
return complete;
return this.complete;
}
public void setComplete(boolean complete) {
@@ -106,7 +106,7 @@ public class MessageDocument {
}
public Integer getLastReleasedSequence() {
return lastReleasedSequence;
return this.lastReleasedSequence;
}
public void setLastReleasedSequence(int lastReleasedSequence) {

34
spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java
View File

@@ -216,7 +216,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
innerMap.put(MessageHeaders.TIMESTAMP, message.getHeaders().get(MessageHeaders.TIMESTAMP));
document.set_Group_timestamp(createdDate);
template.insert(document, collectionName);
this.template.insert(document, this.collectionName);
}
@Override
@@ -277,7 +277,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
Assert.notNull(groupId, "'groupId' must not be null");
Assert.notNull(message, "'message' must not be null");
Query query = whereGroupIdOrder(groupId);
MessageWrapper messageDocument = template.findOne(query, MessageWrapper.class, collectionName);
MessageWrapper messageDocument = this.template.findOne(query, MessageWrapper.class, this.collectionName);
long createdTime = 0;
int lastReleasedSequence = 0;
@@ -309,8 +309,8 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
Assert.notNull(groupId, "'groupId' must not be null");
Assert.notNull(messageToRemove, "'messageToRemove' must not be null");
template.findAndRemove(whereMessageIdIsAndGroupIdIs(messageToRemove.getHeaders().getId(), groupId),
MessageWrapper.class, collectionName);
this.template.findAndRemove(whereMessageIdIsAndGroupIdIs(messageToRemove.getHeaders().getId(), groupId),
MessageWrapper.class, this.collectionName);
updateGroup(groupId, lastModifiedUpdate());
return getMessageGroup(groupId);
}
@@ -356,7 +356,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
Query query = Query.query(Criteria.where(GROUP_ID_KEY).exists(true));
@SuppressWarnings("rawtypes")
List groupIds = template.getCollection(collectionName)
List groupIds = this.template.getCollection(this.collectionName)
.distinct(GROUP_ID_KEY, query.getQueryObject());
for (Object groupId : groupIds) {
@@ -370,7 +370,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
public Message<?> pollMessageFromGroup(final Object groupId) {
Assert.notNull(groupId, "'groupId' must not be null");
Query query = whereGroupIdIs(groupId).with(new Sort(GROUP_UPDATE_TIMESTAMP_KEY, SEQUENCE));
MessageWrapper messageWrapper = template.findAndRemove(query, MessageWrapper.class, collectionName);
MessageWrapper messageWrapper = this.template.findAndRemove(query, MessageWrapper.class, this.collectionName);
Message<?> message = null;
if (messageWrapper != null) {
message = messageWrapper.getMessage();
@@ -501,7 +501,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
messageType = GenericMessage.class.getName();
}
try {
message = (Message<?>) this.read(ClassUtils.forName(messageType.toString(), classLoader), source);
message = (Message<?>) this.read(ClassUtils.forName(messageType.toString(), MongoDbMessageStore.this.classLoader), source);
}
catch (ClassNotFoundException e) {
throw new IllegalStateException("failed to load class: " + messageType, e);
@@ -547,7 +547,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
Class<?> typeClass = null;
if (source.containsField("_class")) {
Object type = source.get("_class");
typeClass = ClassUtils.forName(type.toString(), classLoader);
typeClass = ClassUtils.forName(type.toString(), MongoDbMessageStore.this.classLoader);
}
else if (source instanceof BasicDBList) {
typeClass = List.class;
@@ -574,7 +574,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
DBObject payloadObject = (DBObject) payload;
Object payloadType = payloadObject.get("_class");
try {
Class<?> payloadClass = ClassUtils.forName(payloadType.toString(), classLoader);
Class<?> payloadClass = ClassUtils.forName(payloadType.toString(), MongoDbMessageStore.this.classLoader);
payload = this.read(payloadClass, payloadObject);
}
catch (Exception e) {
@@ -698,7 +698,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
DBObject inputMessageObject = (DBObject) source.get("inputMessage");
Object inputMessageType = inputMessageObject.get("_class");
try {
Class<?> messageClass = ClassUtils.forName(inputMessageType.toString(), classLoader);
Class<?> messageClass = ClassUtils.forName(inputMessageType.toString(), MongoDbMessageStore.this.classLoader);
inputMessage = (Message<?>) MongoDbMessageStore.this.converter.read(messageClass, inputMessageObject);
}
catch (Exception e) {
@@ -741,7 +741,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
@Override
public byte[] convert(Throwable source) {
return serializingConverter.convert(source);
return this.serializingConverter.convert(source);
}
}
@@ -804,23 +804,23 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
}
public int get_LastReleasedSequenceNumber() {
return _last_released_sequence;
return this._last_released_sequence;
}
public long get_Group_timestamp() {
return _group_timestamp;
return this._group_timestamp;
}
public boolean get_Group_complete() {
return _group_complete;
return this._group_complete;
}
public Object get_GroupId() {
return _groupId;
return this._groupId;
}
public Message<?> getMessage() {
return message;
return this.message;
}
public void set_GroupId(Object groupId) {
@@ -832,7 +832,7 @@ public class MongoDbMessageStore extends AbstractMessageGroupStore
}
public long get_Group_update_timestamp() {
return _group_update_timestamp;
return this._group_update_timestamp;
}
public void set_Group_update_timestamp(long lastModified) {