LPS-138196 regen

liferay · Dec 6, 2021 · 758c99b · 758c99b
1 parent 6f1b5a0
commit 758c99b
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 86 deletions.
diff --git a/...feray/portal/security/sso/openid/connect/persistence/model/OpenIdConnectSessionModel.java b/...feray/portal/security/sso/openid/connect/persistence/model/OpenIdConnectSessionModel.java
@@ -104,20 +104,6 @@ public interface OpenIdConnectSessionModel
 	@Override
 	public void setCompanyId(long companyId);
 
-	/**
-	 * Returns the modified date of this open ID connect session.
-	 *
-	 * @return the modified date of this open ID connect session
-	 */
-	public Date getModifiedDate();
-
-	/**
-	 * Sets the modified date of this open ID connect session.
-	 *
-	 * @param modifiedDate the modified date of this open ID connect session
-	 */
-	public void setModifiedDate(Date modifiedDate);
-
 	/**
 	 * Returns the user ID of this open ID connect session.
 	 *
@@ -146,6 +132,20 @@ public interface OpenIdConnectSessionModel
 	 */
 	public void setUserUuid(String userUuid);
 
+	/**
+	 * Returns the modified date of this open ID connect session.
+	 *
+	 * @return the modified date of this open ID connect session
+	 */
+	public Date getModifiedDate();
+
+	/**
+	 * Sets the modified date of this open ID connect session.
+	 *
+	 * @param modifiedDate the modified date of this open ID connect session
+	 */
+	public void setModifiedDate(Date modifiedDate);
+
 	/**
 	 * Returns the access token of this open ID connect session.
 	 *

diff --git a/...iferay/portal/security/sso/openid/connect/persistence/model/OpenIdConnectSessionSoap.java b/...iferay/portal/security/sso/openid/connect/persistence/model/OpenIdConnectSessionSoap.java
@@ -38,8 +38,8 @@ public static OpenIdConnectSessionSoap toSoapModel(
 		soapModel.setMvccVersion(model.getMvccVersion());
 		soapModel.setOpenIdConnectSessionId(model.getOpenIdConnectSessionId());
 		soapModel.setCompanyId(model.getCompanyId());
-		soapModel.setModifiedDate(model.getModifiedDate());
 		soapModel.setUserId(model.getUserId());
+		soapModel.setModifiedDate(model.getModifiedDate());
 		soapModel.setAccessToken(model.getAccessToken());
 		soapModel.setConfigurationPid(model.getConfigurationPid());
 		soapModel.setIdToken(model.getIdToken());
@@ -131,14 +131,6 @@ public void setCompanyId(long companyId) {
 		_companyId = companyId;
 	}
 
-	public Date getModifiedDate() {
-		return _modifiedDate;
-	}
-
-	public void setModifiedDate(Date modifiedDate) {
-		_modifiedDate = modifiedDate;
-	}
-
 	public long getUserId() {
 		return _userId;
 	}
@@ -147,6 +139,14 @@ public void setUserId(long userId) {
 		_userId = userId;
 	}
 
+	public Date getModifiedDate() {
+		return _modifiedDate;
+	}
+
+	public void setModifiedDate(Date modifiedDate) {
+		_modifiedDate = modifiedDate;
+	}
+
 	public String getAccessToken() {
 		return _accessToken;
 	}
@@ -190,8 +190,8 @@ public void setRefreshToken(String refreshToken) {
 	private long _mvccVersion;
 	private long _openIdConnectSessionId;
 	private long _companyId;
-	private Date _modifiedDate;
 	private long _userId;
+	private Date _modifiedDate;
 	private String _accessToken;
 	private String _configurationPid;
 	private String _idToken;

diff --git a/...feray/portal/security/sso/openid/connect/persistence/model/OpenIdConnectSessionTable.java b/...feray/portal/security/sso/openid/connect/persistence/model/OpenIdConnectSessionTable.java
@@ -44,11 +44,11 @@ public class OpenIdConnectSessionTable
 	public final Column<OpenIdConnectSessionTable, Long> companyId =
 		createColumn(
 			"companyId", Long.class, Types.BIGINT, Column.FLAG_DEFAULT);
+	public final Column<OpenIdConnectSessionTable, Long> userId = createColumn(
+		"userId", Long.class, Types.BIGINT, Column.FLAG_DEFAULT);
 	public final Column<OpenIdConnectSessionTable, Date> modifiedDate =
 		createColumn(
 			"modifiedDate", Date.class, Types.TIMESTAMP, Column.FLAG_DEFAULT);
-	public final Column<OpenIdConnectSessionTable, Long> userId = createColumn(
-		"userId", Long.class, Types.BIGINT, Column.FLAG_DEFAULT);
 	public final Column<OpenIdConnectSessionTable, String> accessToken =
 		createColumn(
 			"accessToken", String.class, Types.VARCHAR, Column.FLAG_DEFAULT);

diff --git a/...ray/portal/security/sso/openid/connect/persistence/model/OpenIdConnectSessionWrapper.java b/...ray/portal/security/sso/openid/connect/persistence/model/OpenIdConnectSessionWrapper.java
@@ -47,8 +47,8 @@ public Map<String, Object> getModelAttributes() {
 		attributes.put("mvccVersion", getMvccVersion());
 		attributes.put("openIdConnectSessionId", getOpenIdConnectSessionId());
 		attributes.put("companyId", getCompanyId());
-		attributes.put("modifiedDate", getModifiedDate());
 		attributes.put("userId", getUserId());
+		attributes.put("modifiedDate", getModifiedDate());
 		attributes.put("accessToken", getAccessToken());
 		attributes.put("configurationPid", getConfigurationPid());
 		attributes.put("idToken", getIdToken());
@@ -79,18 +79,18 @@ public void setModelAttributes(Map<String, Object> attributes) {
 			setCompanyId(companyId);
 		}
 
-		Date modifiedDate = (Date)attributes.get("modifiedDate");
-
-		if (modifiedDate != null) {
-			setModifiedDate(modifiedDate);
-		}
-
 		Long userId = (Long)attributes.get("userId");
 
 		if (userId != null) {
 			setUserId(userId);
 		}
 
+		Date modifiedDate = (Date)attributes.get("modifiedDate");
+
+		if (modifiedDate != null) {
+			setModifiedDate(modifiedDate);
+		}
+
 		String accessToken = (String)attributes.get("accessToken");
 
 		if (accessToken != null) {

diff --git a/...tal/security/sso/openid/connect/persistence/service/OpenIdConnectSessionLocalService.java b/...tal/security/sso/openid/connect/persistence/service/OpenIdConnectSessionLocalService.java
@@ -211,7 +211,7 @@ public OpenIdConnectSession fetchOpenIdConnectSession(
 
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public OpenIdConnectSession fetchOpenIdConnectSession(
-		String configurationPid, long userId);
+		long userId, String configurationPid);
 
 	@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
 	public ActionableDynamicQuery getActionableDynamicQuery();

diff --git a/...security/sso/openid/connect/persistence/service/OpenIdConnectSessionLocalServiceUtil.java b/...security/sso/openid/connect/persistence/service/OpenIdConnectSessionLocalServiceUtil.java
@@ -227,9 +227,9 @@ public static OpenIdConnectSession fetchOpenIdConnectSession(
 	}
 
 	public static OpenIdConnectSession fetchOpenIdConnectSession(
-		String configurationPid, long userId) {
+		long userId, String configurationPid) {
 
-		return getService().fetchOpenIdConnectSession(configurationPid, userId);
+		return getService().fetchOpenIdConnectSession(userId, configurationPid);
 	}
 
 	public static com.liferay.portal.kernel.dao.orm.ActionableDynamicQuery

diff --git a/...urity/sso/openid/connect/persistence/service/OpenIdConnectSessionLocalServiceWrapper.java b/...urity/sso/openid/connect/persistence/service/OpenIdConnectSessionLocalServiceWrapper.java
@@ -260,10 +260,10 @@ OpenIdConnectSession fetchOpenIdConnectSession(
 	@Override
 	public com.liferay.portal.security.sso.openid.connect.persistence.model.
 		OpenIdConnectSession fetchOpenIdConnectSession(
-			String configurationPid, long userId) {
+			long userId, String configurationPid) {
 
 		return _openIdConnectSessionLocalService.fetchOpenIdConnectSession(
-			configurationPid, userId);
+			userId, configurationPid);
 	}
 
 	@Override

diff --git a/...al/security/sso/openid/connect/persistence/model/impl/OpenIdConnectSessionCacheModel.java b/...al/security/sso/openid/connect/persistence/model/impl/OpenIdConnectSessionCacheModel.java
@@ -86,10 +86,10 @@ public String toString() {
 		sb.append(openIdConnectSessionId);
 		sb.append(", companyId=");
 		sb.append(companyId);
-		sb.append(", modifiedDate=");
-		sb.append(modifiedDate);
 		sb.append(", userId=");
 		sb.append(userId);
+		sb.append(", modifiedDate=");
+		sb.append(modifiedDate);
 		sb.append(", accessToken=");
 		sb.append(accessToken);
 		sb.append(", configurationPid=");
@@ -114,6 +114,7 @@ public OpenIdConnectSession toEntityModel() {
 		openIdConnectSessionImpl.setOpenIdConnectSessionId(
 			openIdConnectSessionId);
 		openIdConnectSessionImpl.setCompanyId(companyId);
+		openIdConnectSessionImpl.setUserId(userId);
 
 		if (modifiedDate == Long.MIN_VALUE) {
 			openIdConnectSessionImpl.setModifiedDate(null);
@@ -122,8 +123,6 @@ public OpenIdConnectSession toEntityModel() {
 			openIdConnectSessionImpl.setModifiedDate(new Date(modifiedDate));
 		}
 
-		openIdConnectSessionImpl.setUserId(userId);
-
 		if (accessToken == null) {
 			openIdConnectSessionImpl.setAccessToken("");
 		}
@@ -171,9 +170,9 @@ public void readExternal(ObjectInput objectInput) throws IOException {
 		openIdConnectSessionId = objectInput.readLong();
 
 		companyId = objectInput.readLong();
-		modifiedDate = objectInput.readLong();
 
 		userId = objectInput.readLong();
+		modifiedDate = objectInput.readLong();
 		accessToken = objectInput.readUTF();
 		configurationPid = objectInput.readUTF();
 		idToken = objectInput.readUTF();
@@ -188,9 +187,9 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException {
 		objectOutput.writeLong(openIdConnectSessionId);
 
 		objectOutput.writeLong(companyId);
-		objectOutput.writeLong(modifiedDate);
 
 		objectOutput.writeLong(userId);
+		objectOutput.writeLong(modifiedDate);
 
 		if (accessToken == null) {
 			objectOutput.writeUTF("");
@@ -231,8 +230,8 @@ public void writeExternal(ObjectOutput objectOutput) throws IOException {
 	public long mvccVersion;
 	public long openIdConnectSessionId;
 	public long companyId;
-	public long modifiedDate;
 	public long userId;
+	public long modifiedDate;
 	public String accessToken;
 	public String configurationPid;
 	public String idToken;