LPS-59076 OSGI components should not call *ServiceUtil class

liferay · Oct 7, 2015 · 08e2b75 · 08e2b75
1 parent 4e49016
commit 08e2b75
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/build.properties b/build.properties
@@ -248,6 +248,7 @@
 ## Source Formatter
 ##
 
+    source.formatter.check.modules.service.util=false
     source.formatter.check.unprocessed.exceptions=false
 
 ##

diff --git a/modules/util/source-formatter/src/com/liferay/source/formatter/JavaSourceProcessor.java b/modules/util/source-formatter/src/com/liferay/source/formatter/JavaSourceProcessor.java
@@ -911,6 +911,17 @@ else if (absolutePath.contains("/test/unit/") &&
 					"ResourceBundle.getBundle: " + fileName);
 		}
 
+		// LPS-59076
+
+		if (_checkModulesServiceUtil && isModulesFile(absolutePath) &&
+			newContent.contains("@Component") &&
+			newContent.contains("ServiceUtil.")) {
+
+			processErrorMessage(
+				fileName,
+				"OSGI Component should not call ServiceUtil: " + fileName);
+		}
+
 		newContent = getCombinedLinesContent(
 			newContent, _combinedLinesPattern1);
 		newContent = getCombinedLinesContent(
@@ -949,6 +960,9 @@ protected List<String> doGetFileNames() throws Exception {
 		if (portalSource) {
 			fileNames = getPortalJavaFiles();
 
+			_checkModulesServiceUtil = GetterUtil.getBoolean(
+				System.getProperty(
+					"source.formatter.check.modules.service.util"));
 			_checkUnprocessedExceptions = GetterUtil.getBoolean(
 				System.getProperty(
 					"source.formatter.check.unprocessed.exceptions"));
@@ -3221,6 +3235,7 @@ protected String sortExceptions(String line) {
 	private Pattern _catchExceptionPattern = Pattern.compile(
 		"\n(\t+)catch \\((.+Exception) (.+)\\) \\{\n");
 	private List<String> _checkJavaFieldTypesExclusionFiles;
+	private boolean _checkModulesServiceUtil;
 	private boolean _checkUnprocessedExceptions;
 	private Pattern _combinedLinesPattern1 = Pattern.compile(
 		"\n(\t*).+(=|\\]) (\\{)\n");

diff --git a/portal-impl/build.xml b/portal-impl/build.xml
@@ -1001,6 +1001,7 @@ svn://svn.liferay.com/repos/public/alloy/trunk/sandbox/taglibs.
 		>
 			<jvmarg value="-Xmx512m" />
 			<jvmarg value="-Xss2048k" />
+			<jvmarg value="-Dsource.formatter.check.modules.service.util=${source.formatter.check.modules.service.util}" />
 			<jvmarg value="-Dsource.formatter.check.unprocessed.exceptions=${source.formatter.check.unprocessed.exceptions}" />
 			<jvmarg value="-Dsource.formatter.excludes=${source.formatter.excludes}" />
 			<arg value="format.current.branch=${format.current.branch}" />