Skip to content

Commit

Permalink
LPS-62984 Autogenerated
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianchandotcom
Máté Thurzó authored and brianchandotcom committed Feb 8, 2016
1 parent 0f50338 commit f6eb896
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 120 deletions.
1 change: 0 additions & 1 deletion portal-impl/src/META-INF/portal-hbm.xml
View file
Expand Up @@ -1011,7 +1011,6 @@
<property name="name" type="com.liferay.portal.dao.orm.hibernate.StringType" />
<property name="description" type="com.liferay.portal.dao.orm.hibernate.StringType" />
<property name="addedByLDAPImport" type="com.liferay.portal.dao.orm.hibernate.BooleanType" />
<property name="lastPublishDate" type="org.hibernate.type.TimestampType" />
</class>
<class name="com.liferay.portal.model.impl.UserGroupGroupRoleImpl" table="UserGroupGroupRole" dynamic-update="true">
<composite-id name="primaryKey" class="com.liferay.portal.kernel.service.persistence.UserGroupGroupRolePK">
Expand Down
1 change: 0 additions & 1 deletion portal-impl/src/META-INF/portal-model-hints.xml
View file
Expand Up @@ -1680,7 +1680,6 @@
<hint-collection name="TEXTAREA" />
</field>
<field name="addedByLDAPImport" type="boolean" />
<field name="lastPublishDate" type="Date" />
</model>
<model name="com.liferay.portal.kernel.model.UserGroupGroupRole">
<field name="mvccVersion" type="long" />
Expand Down
14 changes: 1 addition & 13 deletions portal-impl/src/com/liferay/portal/model/impl/UserGroupCacheModel.java
View file
Expand Up @@ -79,7 +79,7 @@ public void setMvccVersion(long mvccVersion) {

@Override
public String toString() {
StringBundler sb = new StringBundler(27);
StringBundler sb = new StringBundler(25);

sb.append("{mvccVersion=");
sb.append(mvccVersion);
Expand All @@ -105,8 +105,6 @@ public String toString() {
sb.append(description);
sb.append(", addedByLDAPImport=");
sb.append(addedByLDAPImport);
sb.append(", lastPublishDate=");
sb.append(lastPublishDate);
sb.append("}");

return sb.toString();
Expand Down Expand Up @@ -168,13 +166,6 @@ public UserGroup toEntityModel() {

userGroupImpl.setAddedByLDAPImport(addedByLDAPImport);

if (lastPublishDate == Long.MIN_VALUE) {
userGroupImpl.setLastPublishDate(null);
}
else {
userGroupImpl.setLastPublishDate(new Date(lastPublishDate));
}

userGroupImpl.resetOriginalValues();

return userGroupImpl;
Expand All @@ -199,7 +190,6 @@ public void readExternal(ObjectInput objectInput) throws IOException {
description = objectInput.readUTF();

addedByLDAPImport = objectInput.readBoolean();
lastPublishDate = objectInput.readLong();
}

@Override
Expand Down Expand Up @@ -247,7 +237,6 @@ public void writeExternal(ObjectOutput objectOutput)
}

objectOutput.writeBoolean(addedByLDAPImport);
objectOutput.writeLong(lastPublishDate);
}

public long mvccVersion;
Expand All @@ -262,5 +251,4 @@ public void writeExternal(ObjectOutput objectOutput)
public String name;
public String description;
public boolean addedByLDAPImport;
public long lastPublishDate;
}
46 changes: 4 additions & 42 deletions portal-impl/src/com/liferay/portal/model/impl/UserGroupModelImpl.java
View file
Expand Up @@ -83,8 +83,7 @@ public class UserGroupModelImpl extends BaseModelImpl<UserGroup>
{ "parentUserGroupId", Types.BIGINT },
{ "name", Types.VARCHAR },
{ "description", Types.VARCHAR },
{ "addedByLDAPImport", Types.BOOLEAN },
{ "lastPublishDate", Types.TIMESTAMP }
{ "addedByLDAPImport", Types.BOOLEAN }
};
public static final Map<String, Integer> TABLE_COLUMNS_MAP = new HashMap<String, Integer>();

Expand All @@ -101,10 +100,9 @@ public class UserGroupModelImpl extends BaseModelImpl<UserGroup>
TABLE_COLUMNS_MAP.put("name", Types.VARCHAR);
TABLE_COLUMNS_MAP.put("description", Types.VARCHAR);
TABLE_COLUMNS_MAP.put("addedByLDAPImport", Types.BOOLEAN);
TABLE_COLUMNS_MAP.put("lastPublishDate", Types.TIMESTAMP);
}

public static final String TABLE_SQL_CREATE = "create table UserGroup (mvccVersion LONG default 0 not null,uuid_ VARCHAR(75) null,userGroupId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,parentUserGroupId LONG,name VARCHAR(75) null,description STRING null,addedByLDAPImport BOOLEAN,lastPublishDate DATE null)";
public static final String TABLE_SQL_CREATE = "create table UserGroup (mvccVersion LONG default 0 not null,uuid_ VARCHAR(75) null,userGroupId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,parentUserGroupId LONG,name VARCHAR(75) null,description STRING null,addedByLDAPImport BOOLEAN)";
public static final String TABLE_SQL_DROP = "drop table UserGroup";
public static final String ORDER_BY_JPQL = " ORDER BY userGroup.name ASC";
public static final String ORDER_BY_SQL = " ORDER BY UserGroup.name ASC";
Expand Down Expand Up @@ -150,7 +148,6 @@ public static UserGroup toModel(UserGroupSoap soapModel) {
model.setName(soapModel.getName());
model.setDescription(soapModel.getDescription());
model.setAddedByLDAPImport(soapModel.getAddedByLDAPImport());
model.setLastPublishDate(soapModel.getLastPublishDate());

return model;
}
Expand Down Expand Up @@ -254,7 +251,6 @@ public Map<String, Object> getModelAttributes() {
attributes.put("name", getName());
attributes.put("description", getDescription());
attributes.put("addedByLDAPImport", getAddedByLDAPImport());
attributes.put("lastPublishDate", getLastPublishDate());

attributes.put("entityCacheEnabled", isEntityCacheEnabled());
attributes.put("finderCacheEnabled", isFinderCacheEnabled());
Expand Down Expand Up @@ -335,12 +331,6 @@ public void setModelAttributes(Map<String, Object> attributes) {
if (addedByLDAPImport != null) {
setAddedByLDAPImport(addedByLDAPImport);
}

Date lastPublishDate = (Date)attributes.get("lastPublishDate");

if (lastPublishDate != null) {
setLastPublishDate(lastPublishDate);
}
}

@JSON
Expand Down Expand Up @@ -564,17 +554,6 @@ public void setAddedByLDAPImport(boolean addedByLDAPImport) {
_addedByLDAPImport = addedByLDAPImport;
}

@JSON
@Override
public Date getLastPublishDate() {
return _lastPublishDate;
}

@Override
public void setLastPublishDate(Date lastPublishDate) {
_lastPublishDate = lastPublishDate;
}

@Override
public StagedModelType getStagedModelType() {
return new StagedModelType(PortalUtil.getClassNameId(
Expand Down Expand Up @@ -624,7 +603,6 @@ public Object clone() {
userGroupImpl.setName(getName());
userGroupImpl.setDescription(getDescription());
userGroupImpl.setAddedByLDAPImport(getAddedByLDAPImport());
userGroupImpl.setLastPublishDate(getLastPublishDate());

userGroupImpl.resetOriginalValues();

Expand Down Expand Up @@ -768,21 +746,12 @@ public CacheModel<UserGroup> toCacheModel() {

userGroupCacheModel.addedByLDAPImport = getAddedByLDAPImport();

Date lastPublishDate = getLastPublishDate();

if (lastPublishDate != null) {
userGroupCacheModel.lastPublishDate = lastPublishDate.getTime();
}
else {
userGroupCacheModel.lastPublishDate = Long.MIN_VALUE;
}

return userGroupCacheModel;
}

@Override
public String toString() {
StringBundler sb = new StringBundler(27);
StringBundler sb = new StringBundler(25);

sb.append("{mvccVersion=");
sb.append(getMvccVersion());
Expand All @@ -808,16 +777,14 @@ public String toString() {
sb.append(getDescription());
sb.append(", addedByLDAPImport=");
sb.append(getAddedByLDAPImport());
sb.append(", lastPublishDate=");
sb.append(getLastPublishDate());
sb.append("}");

return sb.toString();
}

@Override
public String toXmlString() {
StringBundler sb = new StringBundler(43);
StringBundler sb = new StringBundler(40);

sb.append("<model><model-name>");
sb.append("com.liferay.portal.kernel.model.UserGroup");
Expand Down Expand Up @@ -871,10 +838,6 @@ public String toXmlString() {
"<column><column-name>addedByLDAPImport</column-name><column-value><![CDATA[");
sb.append(getAddedByLDAPImport());
sb.append("]]></column-value></column>");
sb.append(
"<column><column-name>lastPublishDate</column-name><column-value><![CDATA[");
sb.append(getLastPublishDate());
sb.append("]]></column-value></column>");

sb.append("</model>");

Expand Down Expand Up @@ -904,7 +867,6 @@ public String toXmlString() {
private String _originalName;
private String _description;
private boolean _addedByLDAPImport;
private Date _lastPublishDate;
private long _columnBitmask;
private UserGroup _escapedModel;
}
1 change: 0 additions & 1 deletion portal-impl/src/com/liferay/portal/service/persistence/impl/UserGroupPersistenceImpl.java
View file
Expand Up @@ -4500,7 +4500,6 @@ protected UserGroup toUnwrappedModel(UserGroup userGroup) {
userGroupImpl.setName(userGroup.getName());
userGroupImpl.setDescription(userGroup.getDescription());
userGroupImpl.setAddedByLDAPImport(userGroup.isAddedByLDAPImport());
userGroupImpl.setLastPublishDate(userGroup.getLastPublishDate());

return userGroupImpl;
}
Expand Down
10 changes: 1 addition & 9 deletions ...est/integration/com/liferay/portal/service/persistence/test/UserGroupPersistenceTest.java
View file
Expand Up @@ -140,8 +140,6 @@ public void testUpdateExisting() throws Exception {

newUserGroup.setAddedByLDAPImport(RandomTestUtil.randomBoolean());

newUserGroup.setLastPublishDate(RandomTestUtil.nextDate());

_userGroups.add(_persistence.update(newUserGroup));

UserGroup existingUserGroup = _persistence.findByPrimaryKey(newUserGroup.getPrimaryKey());
Expand Down Expand Up @@ -170,9 +168,6 @@ public void testUpdateExisting() throws Exception {
newUserGroup.getDescription());
Assert.assertEquals(existingUserGroup.getAddedByLDAPImport(),
newUserGroup.getAddedByLDAPImport());
Assert.assertEquals(Time.getShortTimestamp(
existingUserGroup.getLastPublishDate()),
Time.getShortTimestamp(newUserGroup.getLastPublishDate()));
}

@Test
Expand Down Expand Up @@ -244,8 +239,7 @@ protected OrderByComparator<UserGroup> getOrderByComparator() {
true, "uuid", true, "userGroupId", true, "companyId", true,
"userId", true, "userName", true, "createDate", true,
"modifiedDate", true, "parentUserGroupId", true, "name", true,
"description", true, "addedByLDAPImport", true, "lastPublishDate",
true);
"description", true, "addedByLDAPImport", true);
}

@Test
Expand Down Expand Up @@ -483,8 +477,6 @@ protected UserGroup addUserGroup() throws Exception {

userGroup.setAddedByLDAPImport(RandomTestUtil.randomBoolean());

userGroup.setLastPublishDate(RandomTestUtil.nextDate());

_userGroups.add(_persistence.update(userGroup));

return userGroup;
Expand Down
14 changes: 0 additions & 14 deletions portal-service/src/com/liferay/portal/kernel/model/UserGroupModel.java
View file
Expand Up @@ -270,20 +270,6 @@ public interface UserGroupModel extends BaseModel<UserGroup>, MVCCModel,
*/
public void setAddedByLDAPImport(boolean addedByLDAPImport);

/**
* Returns the last publish date of this user group.
*
* @return the last publish date of this user group
*/
public Date getLastPublishDate();

/**
* Sets the last publish date of this user group.
*
* @param lastPublishDate the last publish date of this user group
*/
public void setLastPublishDate(Date lastPublishDate);

@Override
public boolean isNew();

Expand Down
10 changes: 0 additions & 10 deletions portal-service/src/com/liferay/portal/kernel/model/UserGroupSoap.java
View file
Expand Up @@ -46,7 +46,6 @@ public static UserGroupSoap toSoapModel(UserGroup model) {
soapModel.setName(model.getName());
soapModel.setDescription(model.getDescription());
soapModel.setAddedByLDAPImport(model.getAddedByLDAPImport());
soapModel.setLastPublishDate(model.getLastPublishDate());

return soapModel;
}
Expand Down Expand Up @@ -199,14 +198,6 @@ public void setAddedByLDAPImport(boolean addedByLDAPImport) {
_addedByLDAPImport = addedByLDAPImport;
}

public Date getLastPublishDate() {
return _lastPublishDate;
}

public void setLastPublishDate(Date lastPublishDate) {
_lastPublishDate = lastPublishDate;
}

private long _mvccVersion;
private String _uuid;
private long _userGroupId;
Expand All @@ -219,5 +210,4 @@ public void setLastPublishDate(Date lastPublishDate) {
private String _name;
private String _description;
private boolean _addedByLDAPImport;
private Date _lastPublishDate;
}
27 changes: 0 additions & 27 deletions portal-service/src/com/liferay/portal/kernel/model/UserGroupWrapper.java
View file
Expand Up @@ -70,7 +70,6 @@ public Map<String, Object> getModelAttributes() {
attributes.put("name", getName());
attributes.put("description", getDescription());
attributes.put("addedByLDAPImport", getAddedByLDAPImport());
attributes.put("lastPublishDate", getLastPublishDate());

return attributes;
}
Expand Down Expand Up @@ -148,12 +147,6 @@ public void setModelAttributes(Map<String, Object> attributes) {
if (addedByLDAPImport != null) {
setAddedByLDAPImport(addedByLDAPImport);
}

Date lastPublishDate = (Date)attributes.get("lastPublishDate");

if (lastPublishDate != null) {
setLastPublishDate(lastPublishDate);
}
}

@Override
Expand Down Expand Up @@ -223,16 +216,6 @@ public long getGroupId()
return _userGroup.getGroupId();
}

/**
* Returns the last publish date of this user group.
*
* @return the last publish date of this user group
*/
@Override
public Date getLastPublishDate() {
return _userGroup.getLastPublishDate();
}

/**
* Returns the modified date of this user group.
*
Expand Down Expand Up @@ -457,16 +440,6 @@ public void setExpandoBridgeAttributes(ServiceContext serviceContext) {
_userGroup.setExpandoBridgeAttributes(serviceContext);
}

/**
* Sets the last publish date of this user group.
*
* @param lastPublishDate the last publish date of this user group
*/
@Override
public void setLastPublishDate(Date lastPublishDate) {
_userGroup.setLastPublishDate(lastPublishDate);
}

/**
* Sets the modified date of this user group.
*
Expand Down
3 changes: 1 addition & 2 deletions sql/portal-tables.sql
View file
Expand Up @@ -1604,8 +1604,7 @@ create table UserGroup (
parentUserGroupId LONG,
name VARCHAR(75) null,
description STRING null,
addedByLDAPImport BOOLEAN,
lastPublishDate DATE null
addedByLDAPImport BOOLEAN
);

create table UserGroupGroupRole (
Expand Down

0 comments on commit f6eb896

Please sign in to comment.