LPS-62861 auto SF

liferay · Apr 14, 2016 · d37df1e · d37df1e
1 parent 74460dd
commit d37df1e
Showing 1 changed file with 38 additions and 38 deletions.
diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_0_0/UpgradeGroup.java b/portal-impl/src/com/liferay/portal/upgrade/v6_0_0/UpgradeGroup.java
@@ -30,44 +30,6 @@
  */
 public class UpgradeGroup extends UpgradeProcess {
 
-	protected void updateGlobalFriendlyURL(long companyId) throws Exception {
-		long groupId = getGroupId(
-			companyId, GroupConstants.GLOBAL_FRIENDLY_URL);
-
-		if (groupId == 0) {
-			return;
-		}
-
-		String friendlyURL = getNewFriendlyURL(companyId, groupId);
-
-		if (_log.isInfoEnabled()) {
-			_log.info(
-				"Updating friendly URL " + GroupConstants.GLOBAL_FRIENDLY_URL +
-					" of global group " + groupId + " to " + friendlyURL);
-		}
-
-		try (PreparedStatement ps = connection.prepareStatement(
-				"update Group_ set friendlyURL = ? where groupId = ?")) {
-
-			ps.setString(1, friendlyURL);
-			ps.setLong(2, groupId);
-
-			ps.execute();
-		}
-	}
-
-	protected void updateGlobalFriendlyURLs() throws Exception {
-		try (Statement s = connection.createStatement()) {
-			String query = "select companyId from Company";
-
-			try (ResultSet rs = s.executeQuery(query)) {
-				while (rs.next()) {
-					updateGlobalFriendlyURL(rs.getLong(1));
-				}
-			}
-		}
-	}
-
 	@Override
 	protected void doUpgrade() throws Exception {
 		updateGlobalFriendlyURLs();
@@ -128,6 +90,44 @@ protected String getNewFriendlyURL(long companyId, long groupId)
 		return friendlyURL;
 	}
 
+	protected void updateGlobalFriendlyURL(long companyId) throws Exception {
+		long groupId = getGroupId(
+			companyId, GroupConstants.GLOBAL_FRIENDLY_URL);
+
+		if (groupId == 0) {
+			return;
+		}
+
+		String friendlyURL = getNewFriendlyURL(companyId, groupId);
+
+		if (_log.isInfoEnabled()) {
+			_log.info(
+				"Updating friendly URL " + GroupConstants.GLOBAL_FRIENDLY_URL +
+					" of global group " + groupId + " to " + friendlyURL);
+		}
+
+		try (PreparedStatement ps = connection.prepareStatement(
+				"update Group_ set friendlyURL = ? where groupId = ?")) {
+
+			ps.setString(1, friendlyURL);
+			ps.setLong(2, groupId);
+
+			ps.execute();
+		}
+	}
+
+	protected void updateGlobalFriendlyURLs() throws Exception {
+		try (Statement s = connection.createStatement()) {
+			String query = "select companyId from Company";
+
+			try (ResultSet rs = s.executeQuery(query)) {
+				while (rs.next()) {
+					updateGlobalFriendlyURL(rs.getLong(1));
+				}
+			}
+		}
+	}
+
 	protected void updateParentGroupId() throws Exception {
 		try (LoggingTimer loggingTimer = new LoggingTimer()) {
 			long classNameId = PortalUtil.getClassNameId(