INSPECTIT-1948: updated PMD plugin and replaced eclipse PMD

pbouillet · stefansiegl · commit 49c3e275ed4d · 2017-03-03T14:07:27.000+01:00
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
diff --git a/inspectit.agent.java/.eclipse-pmd b/inspectit.agent.java/.eclipse-pmd
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
+  <analysis enabled="true" />
+  <rulesets>
+    <ruleset name="Custom ruleset" ref="../resources/config/pmd/pmd_rules.xml" refcontext="project" />
+  </rulesets>
+</eclipse-pmd>
diff --git a/inspectit.agent.java/.pmd b/inspectit.agent.java/.pmd
diff --git a/inspectit.agent.java/.project b/inspectit.agent.java/.project
@@ -25,12 +25,18 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
diff --git a/inspectit.agent.java/src/main/java/rocks/inspectit/agent/java/logback/LogInitializer.java b/inspectit.agent.java/src/main/java/rocks/inspectit/agent/java/logback/LogInitializer.java
@@ -78,7 +78,7 @@ public static void initLogging() {
 				}
 
 				// then fail to default if none is specified
-				if ((null == is) && (null != agentJar)) {
+				if (null == is) {
 					String logPath = agentJar.getParent() + File.separator + File.separator + DEFAULT_LOG_FILE_NAME;
 					File logFile = new File(logPath);
 					if (logFile.exists()) {
diff --git a/inspectit.agent.java/src/main/java/rocks/inspectit/agent/java/sensor/method/http/HttpHook.java b/inspectit.agent.java/src/main/java/rocks/inspectit/agent/java/sensor/method/http/HttpHook.java
@@ -144,7 +144,7 @@ public HttpHook(Timer timer, IPlatformManager platformManager, Map<String, Objec
 		this.threadMXBean = threadMXBean;
 		this.extractor = new HttpInformationExtractor(new StringConstraint(parameters));
 
-		if ((null != parameters) && "true".equals(parameters.get("sessioncapture"))) {
+		if ("true".equals(parameters.get("sessioncapture"))) {
 			if (LOG.isDebugEnabled()) {
 				LOG.debug("Enabling session capturing for the http sensor");
 			}
diff --git a/inspectit.agent.java/src/main/java/rocks/inspectit/agent/java/sensor/method/jdbc/PreparedStatementParameterHook.java b/inspectit.agent.java/src/main/java/rocks/inspectit/agent/java/sensor/method/jdbc/PreparedStatementParameterHook.java
@@ -83,7 +83,7 @@ public void secondAfterBody(ICoreService coreService, long methodId, long sensor
 			threadLast.set(Boolean.FALSE);
 
 			List<String> parameterTypes = rsc.getParameterTypes();
-			if (METHOD_VALUE_MAP.containsKey(rsc.getTargetMethodName()) && (parameterTypes.size() >= 1) && "int".equals(parameterTypes.get(0))) {
+			if (METHOD_VALUE_MAP.containsKey(rsc.getTargetMethodName()) && !parameterTypes.isEmpty() && "int".equals(parameterTypes.get(0))) {
 				// subtract one as the index starts at 1, and not at 0
 				int index = ((Integer) parameters[0]).intValue() - 1;
 				Object value = METHOD_VALUE_MAP.get(rsc.getTargetMethodName());
diff --git a/inspectit.root.gradle b/inspectit.root.gradle
@@ -230,8 +230,10 @@ cpdCheck {
 	}
 }
 
-task cpdHtmlReport << {
-	ant.xslt(in: "${buildQAAnalysisCPD}/main.xml", style: cpdReportFile, out: "${buildQAAnalysisCPD}/../cpd.html")
+task cpdHtmlReport {
+	doLast {
+		ant.xslt(in: "${buildQAAnalysisCPD}/main.xml", style: cpdReportFile, out: "${buildQAAnalysisCPD}/../cpd.html")
+	}
 }
 cpdCheck.finalizedBy cpdHtmlReport
 
@@ -327,13 +329,15 @@ subprojects {
 		ruleSetFiles = files(pmdRulesFile)
 		ruleSets = []
 		reportsDir = file(buildQAAnalysisPMD)
-		toolVersion = '5.1.0'
+		toolVersion = '5.4.1'
 	}
 
-	task pmdHtmlReport << {
-		ant.xslt(in: "${buildQAAnalysisPMD}/main.xml", style: pmdReportFile, out: "${buildQAAnalysisPMD}/sortable_report.html")
-		ant.copy(todir: buildQAAnalysisPMD, file: pmdSortableFile)      
-		new File(buildQAAnalysis, "pmd.html").text = "<meta http-equiv=\"refresh\" content=\"0; url=pmd/sortable_report.html\" >"
+	task pmdHtmlReport {
+		doLast {
+			ant.xslt(in: "${buildQAAnalysisPMD}/main.xml", style: pmdReportFile, out: "${buildQAAnalysisPMD}/sortable_report.html")
+			ant.copy(todir: buildQAAnalysisPMD, file: pmdSortableFile)      
+			new File(buildQAAnalysis, "pmd.html").text = "<meta http-equiv=\"refresh\" content=\"0; url=pmd/sortable_report.html\" >"
+		}
 	}
 	pmdMain.finalizedBy pmdHtmlReport
 
@@ -347,8 +351,10 @@ subprojects {
 		toolVersion = '5.6'
 	}
 
-	task checkstyleHtmlReport << {
-		ant.xslt(in: "${buildQAAnalysisCheckstyle}/main.xml", style: "${checkstyleReportFile}", out: "${buildQAAnalysisCheckstyle}/../checkstyle.html")
+	task checkstyleHtmlReport {
+		doLast {
+			ant.xslt(in: "${buildQAAnalysisCheckstyle}/main.xml", style: "${checkstyleReportFile}", out: "${buildQAAnalysisCheckstyle}/../checkstyle.html")
+		}
 	}
 	checkstyleMain.finalizedBy checkstyleHtmlReport
 
@@ -363,8 +369,10 @@ subprojects {
 		toolVersion = '2.0.0'
 	}
 
-	task findbugsHtmlReport << {
-		ant.xslt(in: "${buildQAAnalysisFindbugs}/main.xml", style: findbugsConfigFancyHist, out: "${buildQAAnalysisFindbugs}/../findbugs.html")
+	task findbugsHtmlReport {
+		doLast {
+			ant.xslt(in: "${buildQAAnalysisFindbugs}/main.xml", style: findbugsConfigFancyHist, out: "${buildQAAnalysisFindbugs}/../findbugs.html")
+		}
 	} 
 	findbugsMain.finalizedBy findbugsHtmlReport
 
diff --git a/inspectit.server/.eclipse-pmd b/inspectit.server/.eclipse-pmd
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
+  <analysis enabled="true" />
+  <rulesets>
+    <ruleset name="Custom ruleset" ref="../resources/config/pmd/pmd_rules.xml" refcontext="project" />
+  </rulesets>
+</eclipse-pmd>
diff --git a/inspectit.server/.pmd b/inspectit.server/.pmd
diff --git a/inspectit.server/.project b/inspectit.server/.project
@@ -25,12 +25,18 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
diff --git a/inspectit.server/src/main/java/rocks/inspectit/server/dao/impl/TimerDataAggregator.java b/inspectit.server/src/main/java/rocks/inspectit/server/dao/impl/TimerDataAggregator.java
@@ -181,8 +181,8 @@ void saveAllInPersistList() {
 				protected void doInTransactionWithoutResult(TransactionStatus status) {
 					TimerData last = persistList.poll();
 					while (last != null) {
-						last.finalizeData();
-						TimerDataAggregator.super.create(last);
+						TimerData data = (TimerData) last.finalizeData();
+						TimerDataAggregator.super.create(data);
 						last = persistList.poll();
 					}
 				}
diff --git a/inspectit.server/src/main/java/rocks/inspectit/server/property/PropertyUpdateExecutor.java b/inspectit.server/src/main/java/rocks/inspectit/server/property/PropertyUpdateExecutor.java
@@ -250,7 +250,7 @@ private static final class PropertyUpdateFieldInfo {
 		 * @param property
 		 *            Property name.
 		 */
-		public PropertyUpdateFieldInfo(Object target, Field field, String property) {
+		PropertyUpdateFieldInfo(Object target, Field field, String property) {
 			if (null == target) {
 				throw new IllegalArgumentException("Target object can not be null.");
 			}
diff --git a/inspectit.server/src/main/java/rocks/inspectit/server/service/AgentStorageService.java b/inspectit.server/src/main/java/rocks/inspectit/server/service/AgentStorageService.java
@@ -212,10 +212,6 @@ public void run() {
 
 				List<? extends DefaultData> defaultDataList = softReference.get();
 				if (defaultDataList != null) {
-					for (DefaultData data : defaultDataList) {
-						data.finalizeData();
-					}
-
 					long time = 0;
 					if (log.isDebugEnabled()) {
 						time = System.nanoTime();
diff --git a/inspectit.server/src/main/java/rocks/inspectit/server/storage/CmrStorageManager.java b/inspectit.server/src/main/java/rocks/inspectit/server/storage/CmrStorageManager.java
@@ -763,12 +763,9 @@ public void addLabelToStorage(StorageData storageData, AbstractStorageLabel<?> s
 	 */
 	public boolean removeLabelFromStorage(StorageData storageData, AbstractStorageLabel<?> storageLabel) throws IOException, SerializationException, BusinessException {
 		StorageData local = getLocalStorageDataObject(storageData);
-		if (null != local) {
-			boolean removed = local.removeLabel(storageLabel);
-			writeStorageDataToDisk(local);
-			return removed;
-		}
-		return false;
+		boolean removed = local.removeLabel(storageLabel);
+		writeStorageDataToDisk(local);
+		return removed;
 	}
 
 	/**
@@ -785,14 +782,10 @@ public boolean removeLabelFromStorage(StorageData storageData, AbstractStorageLa
 	 */
 	public void updateStorageData(StorageData storageData) throws BusinessException, IOException, SerializationException {
 		StorageData local = getLocalStorageDataObject(storageData);
-		if (null == local) {
-			throw new BusinessException("Update of the storage data" + storageData + ".", StorageErrorCodeEnum.STORAGE_DOES_NOT_EXIST);
-		} else {
-			synchronized (local) {
-				local.setName(storageData.getName());
-				local.setDescription(storageData.getDescription());
-				writeStorageDataToDisk(local);
-			}
+		synchronized (local) {
+			local.setName(storageData.getName());
+			local.setDescription(storageData.getDescription());
+			writeStorageDataToDisk(local);
 		}
 	}
 
diff --git a/inspectit.server/src/main/java/rocks/inspectit/server/template/AlertEMailTemplateType.java b/inspectit.server/src/main/java/rocks/inspectit/server/template/AlertEMailTemplateType.java
@@ -90,7 +90,7 @@ public boolean isText() {
 	 * @author Alexander Wert
 	 *
 	 */
-	public interface Placeholders {
+	interface Placeholders {
 		/**
 		 * Placeholder for alert definition name.
 		 */
diff --git a/inspectit.shared.all/.eclipse-pmd b/inspectit.shared.all/.eclipse-pmd
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
+  <analysis enabled="true" />
+  <rulesets>
+    <ruleset name="Custom ruleset" ref="../resources/config/pmd/pmd_rules.xml" refcontext="project" />
+  </rulesets>
+</eclipse-pmd>
diff --git a/inspectit.shared.all/.pmd b/inspectit.shared.all/.pmd
diff --git a/inspectit.shared.all/.project b/inspectit.shared.all/.project
@@ -35,13 +35,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
diff --git a/inspectit.shared.all/src/main/java/rocks/inspectit/shared/all/communication/data/JmxSensorValueData.java b/inspectit.shared.all/src/main/java/rocks/inspectit/shared/all/communication/data/JmxSensorValueData.java
@@ -287,7 +287,7 @@ protected void prePersist() {
 	@Override
 	public String toString() {
 		return "JmxSensorValueData [jmxSensorDefinitionDataIdent=" + jmxSensorDefinitionDataIdentId + ", value=" + value + ", getId()=" + getId() + ", getPlatformIdent()=" + getPlatformIdent()
-				+ ", getSensorTypeIdent()=" + getSensorTypeIdent() + ", getTimeStamp()=" + getTimeStamp() + "]";
+		+ ", getSensorTypeIdent()=" + getSensorTypeIdent() + ", getTimeStamp()=" + getTimeStamp() + "]";
 	}
 
 	/**
diff --git a/inspectit.shared.all/src/main/java/rocks/inspectit/shared/all/minlog/MinlogToSLF4JLogger.java b/inspectit.shared.all/src/main/java/rocks/inspectit/shared/all/minlog/MinlogToSLF4JLogger.java
@@ -77,7 +77,7 @@ public void log(int level, String category, String message, Throwable ex) {
 	 * @return combinedMessage
 	 */
 	private String getMessage(String category, String message) {
-		int size = (category != null) ? category.length() + 2 : (0 + message) != null ? message.length() : 0;
+		int size = (category != null) ? category.length() + 2 : (message != null) ? message.length() : 0;
 		StringBuilder stringBuilder = new StringBuilder(size);
 		if (null != category) {
 			stringBuilder.append(category);
diff --git a/inspectit.shared.all/src/main/java/rocks/inspectit/shared/all/serializer/schema/ClassSchemaManager.java b/inspectit.shared.all/src/main/java/rocks/inspectit/shared/all/serializer/schema/ClassSchemaManager.java
@@ -124,15 +124,9 @@ public void loadSchemasFromLocations() throws IOException {
 			}
 		}
 
-		if (null != br) {
-			br.close();
-		}
-		if (null != isr) {
-			isr.close();
-		}
-		if (null != is) {
-			is.close();
-		}
+		br.close();
+		isr.close();
+		is.close();
 	}
 
 	/**
@@ -153,7 +147,9 @@ public boolean accept(File dir, String fileName) {
 			}
 		});
 
-		loadSchemas(files);
+		if (files != null) {
+			loadSchemas(files);
+		}
 	}
 
 	/**
diff --git a/inspectit.shared.cs/.classpath b/inspectit.shared.cs/.classpath
@@ -15,7 +15,11 @@
 			<attribute name="FROM_GRADLE_MODEL" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" path="src/test/resources">
+		<attributes>
+			<attribute name="FROM_GRADLE_MODEL" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/inspectit.shared.cs/.eclipse-pmd b/inspectit.shared.cs/.eclipse-pmd
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
+  <analysis enabled="true" />
+  <rulesets>
+    <ruleset name="Custom ruleset" ref="../resources/config/pmd/pmd_rules.xml" refcontext="project" />
+  </rulesets>
+</eclipse-pmd>
diff --git a/inspectit.shared.cs/.pmd b/inspectit.shared.cs/.pmd
diff --git a/inspectit.shared.cs/.project b/inspectit.shared.cs/.project
@@ -35,13 +35,19 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
diff --git a/inspectit.ui.rcp/.eclipse-pmd b/inspectit.ui.rcp/.eclipse-pmd
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<eclipse-pmd xmlns="http://acanda.ch/eclipse-pmd/0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://acanda.ch/eclipse-pmd/0.8 http://acanda.ch/eclipse-pmd/eclipse-pmd-0.8.xsd">
+  <analysis enabled="true" />
+  <rulesets>
+    <ruleset name="Custom ruleset" ref="../resources/config/pmd/pmd_rules.xml" refcontext="project" />
+  </rulesets>
+</eclipse-pmd>
diff --git a/inspectit.ui.rcp/.pmd b/inspectit.ui.rcp/.pmd
diff --git a/inspectit.ui.rcp/src/main/java/rocks/inspectit/ui/rcp/dialog/BusinessExceptionDialog.java b/inspectit.ui.rcp/src/main/java/rocks/inspectit/ui/rcp/dialog/BusinessExceptionDialog.java
diff --git a/inspectit.ui.rcp/src/main/java/rocks/inspectit/ui/rcp/handlers/OpenUrlHandler.java b/inspectit.ui.rcp/src/main/java/rocks/inspectit/ui/rcp/handlers/OpenUrlHandler.java
diff --git a/resources/config/pmd/pmd_rules.xml b/resources/config/pmd/pmd_rules.xml
diff --git a/resources/oomph/inspectIT.setup b/resources/oomph/inspectIT.setup

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static void initLogging() {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// then fail to default if none is specified`
`81`		`- if ((null == is) && (null != agentJar)) {`
	`81`	`+ if (null == is) {`
`82`	`82`	`String logPath = agentJar.getParent() + File.separator + File.separator + DEFAULT_LOG_FILE_NAME;`
`83`	`83`	`File logFile = new File(logPath);`
`84`	`84`	`if (logFile.exists()) {`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public HttpHook(Timer timer, IPlatformManager platformManager, Map<String, Objec`
`144`	`144`	`this.threadMXBean = threadMXBean;`
`145`	`145`	`this.extractor = new HttpInformationExtractor(new StringConstraint(parameters));`
`146`	`146`
`147`		`- if ((null != parameters) && "true".equals(parameters.get("sessioncapture"))) {`
	`147`	`+ if ("true".equals(parameters.get("sessioncapture"))) {`
`148`	`148`	`if (LOG.isDebugEnabled()) {`
`149`	`149`	`LOG.debug("Enabling session capturing for the http sensor");`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,10 @@ cpdCheck {`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`
`233`		`-task cpdHtmlReport << {`
`234`		`- ant.xslt(in: "${buildQAAnalysisCPD}/main.xml", style: cpdReportFile, out: "${buildQAAnalysisCPD}/../cpd.html")`
	`233`	`+task cpdHtmlReport {`
	`234`	`+ doLast {`
	`235`	`+ ant.xslt(in: "${buildQAAnalysisCPD}/main.xml", style: cpdReportFile, out: "${buildQAAnalysisCPD}/../cpd.html")`
	`236`	`+ }`
`235`	`237`	`}`
`236`	`238`	`cpdCheck.finalizedBy cpdHtmlReport`
`237`	`239`
`@@ -327,13 +329,15 @@ subprojects {`
`327`	`329`	`ruleSetFiles = files(pmdRulesFile)`
`328`	`330`	`ruleSets = []`
`329`	`331`	`reportsDir = file(buildQAAnalysisPMD)`
`330`		`- toolVersion = '5.1.0'`
	`332`	`+ toolVersion = '5.4.1'`
`331`	`333`	`}`
`332`	`334`
`333`		`- task pmdHtmlReport << {`
`334`		`- ant.xslt(in: "${buildQAAnalysisPMD}/main.xml", style: pmdReportFile, out: "${buildQAAnalysisPMD}/sortable_report.html")`
`335`		`- ant.copy(todir: buildQAAnalysisPMD, file: pmdSortableFile)`
`336`		`- new File(buildQAAnalysis, "pmd.html").text = "<meta http-equiv=\"refresh\" content=\"0; url=pmd/sortable_report.html\" >"`
	`335`	`+ task pmdHtmlReport {`
	`336`	`+ doLast {`
	`337`	`+ ant.xslt(in: "${buildQAAnalysisPMD}/main.xml", style: pmdReportFile, out: "${buildQAAnalysisPMD}/sortable_report.html")`
	`338`	`+ ant.copy(todir: buildQAAnalysisPMD, file: pmdSortableFile)`
	`339`	`+ new File(buildQAAnalysis, "pmd.html").text = "<meta http-equiv=\"refresh\" content=\"0; url=pmd/sortable_report.html\" >"`
	`340`	`+ }`
`337`	`341`	`}`
`338`	`342`	`pmdMain.finalizedBy pmdHtmlReport`
`339`	`343`
`@@ -347,8 +351,10 @@ subprojects {`
`347`	`351`	`toolVersion = '5.6'`
`348`	`352`	`}`
`349`	`353`
`350`		`- task checkstyleHtmlReport << {`
`351`		`- ant.xslt(in: "${buildQAAnalysisCheckstyle}/main.xml", style: "${checkstyleReportFile}", out: "${buildQAAnalysisCheckstyle}/../checkstyle.html")`
	`354`	`+ task checkstyleHtmlReport {`
	`355`	`+ doLast {`
	`356`	`+ ant.xslt(in: "${buildQAAnalysisCheckstyle}/main.xml", style: "${checkstyleReportFile}", out: "${buildQAAnalysisCheckstyle}/../checkstyle.html")`
	`357`	`+ }`
`352`	`358`	`}`
`353`	`359`	`checkstyleMain.finalizedBy checkstyleHtmlReport`
`354`	`360`
`@@ -363,8 +369,10 @@ subprojects {`
`363`	`369`	`toolVersion = '2.0.0'`
`364`	`370`	`}`
`365`	`371`
`366`		`- task findbugsHtmlReport << {`
`367`		`- ant.xslt(in: "${buildQAAnalysisFindbugs}/main.xml", style: findbugsConfigFancyHist, out: "${buildQAAnalysisFindbugs}/../findbugs.html")`
	`372`	`+ task findbugsHtmlReport {`
	`373`	`+ doLast {`
	`374`	`+ ant.xslt(in: "${buildQAAnalysisFindbugs}/main.xml", style: findbugsConfigFancyHist, out: "${buildQAAnalysisFindbugs}/../findbugs.html")`
	`375`	`+ }`
`368`	`376`	`}`
`369`	`377`	`findbugsMain.finalizedBy findbugsHtmlReport`
`370`	`378`
Original file line number	Diff line number	Diff line change
`@@ -181,8 +181,8 @@ void saveAllInPersistList() {`
`181`	`181`	`protected void doInTransactionWithoutResult(TransactionStatus status) {`
`182`	`182`	`TimerData last = persistList.poll();`
`183`	`183`	`while (last != null) {`
`184`		`- last.finalizeData();`
`185`		`- TimerDataAggregator.super.create(last);`
	`184`	`+ TimerData data = (TimerData) last.finalizeData();`
	`185`	`+ TimerDataAggregator.super.create(data);`
`186`	`186`	`last = persistList.poll();`
`187`	`187`	`}`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ private static final class PropertyUpdateFieldInfo {`
`250`	`250`	`* @param property`
`251`	`251`	`* Property name.`
`252`	`252`	`*/`
`253`		`- public PropertyUpdateFieldInfo(Object target, Field field, String property) {`
	`253`	`+ PropertyUpdateFieldInfo(Object target, Field field, String property) {`
`254`	`254`	`if (null == target) {`
`255`	`255`	`throw new IllegalArgumentException("Target object can not be null.");`
`256`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public boolean isText() {`
`90`	`90`	`* @author Alexander Wert`
`91`	`91`	`*`
`92`	`92`	`*/`
`93`		`- public interface Placeholders {`
	`93`	`+ interface Placeholders {`
`94`	`94`	`/**`
`95`	`95`	`* Placeholder for alert definition name.`
`96`	`96`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ protected void prePersist() {`
`287`	`287`	`@Override`
`288`	`288`	`public String toString() {`
`289`	`289`	`return "JmxSensorValueData [jmxSensorDefinitionDataIdent=" + jmxSensorDefinitionDataIdentId + ", value=" + value + ", getId()=" + getId() + ", getPlatformIdent()=" + getPlatformIdent()`
`290`		`- + ", getSensorTypeIdent()=" + getSensorTypeIdent() + ", getTimeStamp()=" + getTimeStamp() + "]";`
	`290`	`+ + ", getSensorTypeIdent()=" + getSensorTypeIdent() + ", getTimeStamp()=" + getTimeStamp() + "]";`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -124,15 +124,9 @@ public void loadSchemasFromLocations() throws IOException {`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`127`		`- if (null != br) {`
`128`		`- br.close();`
`129`		`- }`
`130`		`- if (null != isr) {`
`131`		`- isr.close();`
`132`		`- }`
`133`		`- if (null != is) {`
`134`		`- is.close();`
`135`		`- }`
	`127`	`+ br.close();`
	`128`	`+ isr.close();`
	`129`	`+ is.close();`
`136`	`130`	`}`
`137`	`131`
`138`	`132`	`/**`
`@@ -153,7 +147,9 @@ public boolean accept(File dir, String fileName) {`
`153`	`147`	`}`
`154`	`148`	`});`
`155`	`149`
`156`		`- loadSchemas(files);`
	`150`	`+ if (files != null) {`
	`151`	`+ loadSchemas(files);`
	`152`	`+ }`
`157`	`153`	`}`
`158`	`154`
`159`	`155`	`/**`