Skip to content

Commit

Permalink
LPD-15841 Regen
Browse files Browse the repository at this point in the history
  • Loading branch information
@brianchandotcom
brianchandotcom committed Jan 30, 2024
1 parent 65b76f7 commit 67b5d07
Show file tree
Hide file tree
Showing 9 changed files with 95 additions and 95 deletions.
26 changes: 13 additions & 13 deletions ...c/main/java/com/liferay/portal/tools/service/builder/test/model/AutoEscapeEntryModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,33 +59,33 @@ public interface AutoEscapeEntryModel extends BaseModel<AutoEscapeEntry> {
public void setAutoEscapeEntryId(long autoEscapeEntryId);

/**
* Returns the auto escape enabled column of this auto escape entry.
* Returns the auto escape disabled column of this auto escape entry.
*
* @return the auto escape enabled column of this auto escape entry
* @return the auto escape disabled column of this auto escape entry
*/
@AutoEscape
public String getAutoEscapeEnabledColumn();
public String getAutoEscapeDisabledColumn();

/**
* Sets the auto escape enabled column of this auto escape entry.
* Sets the auto escape disabled column of this auto escape entry.
*
* @param autoEscapeEnabledColumn the auto escape enabled column of this auto escape entry
* @param autoEscapeDisabledColumn the auto escape disabled column of this auto escape entry
*/
public void setAutoEscapeEnabledColumn(String autoEscapeEnabledColumn);
public void setAutoEscapeDisabledColumn(String autoEscapeDisabledColumn);

/**
* Returns the auto escape disabled column of this auto escape entry.
* Returns the auto escape enabled column of this auto escape entry.
*
* @return the auto escape disabled column of this auto escape entry
* @return the auto escape enabled column of this auto escape entry
*/
public String getAutoEscapeDisabledColumn();
@AutoEscape
public String getAutoEscapeEnabledColumn();

/**
* Sets the auto escape disabled column of this auto escape entry.
* Sets the auto escape enabled column of this auto escape entry.
*
* @param autoEscapeDisabledColumn the auto escape disabled column of this auto escape entry
* @param autoEscapeEnabledColumn the auto escape enabled column of this auto escape entry
*/
public void setAutoEscapeDisabledColumn(String autoEscapeDisabledColumn);
public void setAutoEscapeEnabledColumn(String autoEscapeEnabledColumn);

@Override
public AutoEscapeEntry cloneWithOriginalValues();
Expand Down
8 changes: 4 additions & 4 deletions ...c/main/java/com/liferay/portal/tools/service/builder/test/model/AutoEscapeEntryTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ public class AutoEscapeEntryTable extends BaseTable<AutoEscapeEntryTable> {
public final Column<AutoEscapeEntryTable, Long> autoEscapeEntryId =
createColumn(
"autoEscapeEntryId", Long.class, Types.BIGINT, Column.FLAG_PRIMARY);
public final Column<AutoEscapeEntryTable, String> autoEscapeEnabledColumn =
createColumn(
"autoEscapeEnabledColumn", String.class, Types.VARCHAR,
Column.FLAG_DEFAULT);
public final Column<AutoEscapeEntryTable, String> autoEscapeDisabledColumn =
createColumn(
"autoEscapeDisabledColumn", String.class, Types.VARCHAR,
Column.FLAG_DEFAULT);
public final Column<AutoEscapeEntryTable, String> autoEscapeEnabledColumn =
createColumn(
"autoEscapeEnabledColumn", String.class, Types.VARCHAR,
Column.FLAG_DEFAULT);

private AutoEscapeEntryTable() {
super("AutoEscapeEntry", AutoEscapeEntryTable::new);
Expand Down
16 changes: 8 additions & 8 deletions ...main/java/com/liferay/portal/tools/service/builder/test/model/AutoEscapeEntryWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public Map<String, Object> getModelAttributes() {
Map<String, Object> attributes = new HashMap<String, Object>();

attributes.put("autoEscapeEntryId", getAutoEscapeEntryId());
attributes.put("autoEscapeEnabledColumn", getAutoEscapeEnabledColumn());
attributes.put(
"autoEscapeDisabledColumn", getAutoEscapeDisabledColumn());
attributes.put("autoEscapeEnabledColumn", getAutoEscapeEnabledColumn());

return attributes;
}
Expand All @@ -48,19 +48,19 @@ public void setModelAttributes(Map<String, Object> attributes) {
setAutoEscapeEntryId(autoEscapeEntryId);
}

String autoEscapeEnabledColumn = (String)attributes.get(
"autoEscapeEnabledColumn");

if (autoEscapeEnabledColumn != null) {
setAutoEscapeEnabledColumn(autoEscapeEnabledColumn);
}

String autoEscapeDisabledColumn = (String)attributes.get(
"autoEscapeDisabledColumn");

if (autoEscapeDisabledColumn != null) {
setAutoEscapeDisabledColumn(autoEscapeDisabledColumn);
}

String autoEscapeEnabledColumn = (String)attributes.get(
"autoEscapeEnabledColumn");

if (autoEscapeEnabledColumn != null) {
setAutoEscapeEnabledColumn(autoEscapeEnabledColumn);
}
}

@Override
Expand Down
32 changes: 16 additions & 16 deletions ...a/com/liferay/portal/tools/service/builder/test/model/impl/AutoEscapeEntryCacheModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ public String toString() {

sb.append("{autoEscapeEntryId=");
sb.append(autoEscapeEntryId);
sb.append(", autoEscapeEnabledColumn=");
sb.append(autoEscapeEnabledColumn);
sb.append(", autoEscapeDisabledColumn=");
sb.append(autoEscapeDisabledColumn);
sb.append(", autoEscapeEnabledColumn=");
sb.append(autoEscapeEnabledColumn);
sb.append("}");

return sb.toString();
Expand All @@ -70,14 +70,6 @@ public AutoEscapeEntry toEntityModel() {

autoEscapeEntryImpl.setAutoEscapeEntryId(autoEscapeEntryId);

if (autoEscapeEnabledColumn == null) {
autoEscapeEntryImpl.setAutoEscapeEnabledColumn("");
}
else {
autoEscapeEntryImpl.setAutoEscapeEnabledColumn(
autoEscapeEnabledColumn);
}

if (autoEscapeDisabledColumn == null) {
autoEscapeEntryImpl.setAutoEscapeDisabledColumn("");
}
Expand All @@ -86,6 +78,14 @@ public AutoEscapeEntry toEntityModel() {
autoEscapeDisabledColumn);
}

if (autoEscapeEnabledColumn == null) {
autoEscapeEntryImpl.setAutoEscapeEnabledColumn("");
}
else {
autoEscapeEntryImpl.setAutoEscapeEnabledColumn(
autoEscapeEnabledColumn);
}

autoEscapeEntryImpl.resetOriginalValues();

return autoEscapeEntryImpl;
Expand All @@ -94,31 +94,31 @@ public AutoEscapeEntry toEntityModel() {
@Override
public void readExternal(ObjectInput objectInput) throws IOException {
autoEscapeEntryId = objectInput.readLong();
autoEscapeEnabledColumn = objectInput.readUTF();
autoEscapeDisabledColumn = objectInput.readUTF();
autoEscapeEnabledColumn = objectInput.readUTF();
}

@Override
public void writeExternal(ObjectOutput objectOutput) throws IOException {
objectOutput.writeLong(autoEscapeEntryId);

if (autoEscapeEnabledColumn == null) {
if (autoEscapeDisabledColumn == null) {
objectOutput.writeUTF("");
}
else {
objectOutput.writeUTF(autoEscapeEnabledColumn);
objectOutput.writeUTF(autoEscapeDisabledColumn);
}

if (autoEscapeDisabledColumn == null) {
if (autoEscapeEnabledColumn == null) {
objectOutput.writeUTF("");
}
else {
objectOutput.writeUTF(autoEscapeDisabledColumn);
objectOutput.writeUTF(autoEscapeEnabledColumn);
}
}

public long autoEscapeEntryId;
public String autoEscapeEnabledColumn;
public String autoEscapeDisabledColumn;
public String autoEscapeEnabledColumn;

}
84 changes: 42 additions & 42 deletions ...va/com/liferay/portal/tools/service/builder/test/model/impl/AutoEscapeEntryModelImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,21 @@ public class AutoEscapeEntryModelImpl

public static final Object[][] TABLE_COLUMNS = {
{"autoEscapeEntryId", Types.BIGINT},
{"autoEscapeEnabledColumn", Types.VARCHAR},
{"autoEscapeDisabledColumn", Types.VARCHAR}
{"autoEscapeDisabledColumn", Types.VARCHAR},
{"autoEscapeEnabledColumn", Types.VARCHAR}
};

public static final Map<String, Integer> TABLE_COLUMNS_MAP =
new HashMap<String, Integer>();

static {
TABLE_COLUMNS_MAP.put("autoEscapeEntryId", Types.BIGINT);
TABLE_COLUMNS_MAP.put("autoEscapeEnabledColumn", Types.VARCHAR);
TABLE_COLUMNS_MAP.put("autoEscapeDisabledColumn", Types.VARCHAR);
TABLE_COLUMNS_MAP.put("autoEscapeEnabledColumn", Types.VARCHAR);
}

public static final String TABLE_SQL_CREATE =
"create table AutoEscapeEntry (autoEscapeEntryId LONG not null primary key,autoEscapeEnabledColumn VARCHAR(75) null,autoEscapeDisabledColumn VARCHAR(75) null)";
"create table AutoEscapeEntry (autoEscapeEntryId LONG not null primary key,autoEscapeDisabledColumn VARCHAR(75) null,autoEscapeEnabledColumn VARCHAR(75) null)";

public static final String TABLE_SQL_DROP = "drop table AutoEscapeEntry";

Expand Down Expand Up @@ -216,12 +216,12 @@ private static class AttributeGetterFunctionsHolder {

attributeGetterFunctions.put(
"autoEscapeEntryId", AutoEscapeEntry::getAutoEscapeEntryId);
attributeGetterFunctions.put(
"autoEscapeEnabledColumn",
AutoEscapeEntry::getAutoEscapeEnabledColumn);
attributeGetterFunctions.put(
"autoEscapeDisabledColumn",
AutoEscapeEntry::getAutoEscapeDisabledColumn);
attributeGetterFunctions.put(
"autoEscapeEnabledColumn",
AutoEscapeEntry::getAutoEscapeEnabledColumn);

_attributeGetterFunctions = Collections.unmodifiableMap(
attributeGetterFunctions);
Expand All @@ -243,14 +243,14 @@ private static class AttributeSetterBiConsumersHolder {
"autoEscapeEntryId",
(BiConsumer<AutoEscapeEntry, Long>)
AutoEscapeEntry::setAutoEscapeEntryId);
attributeSetterBiConsumers.put(
"autoEscapeEnabledColumn",
(BiConsumer<AutoEscapeEntry, String>)
AutoEscapeEntry::setAutoEscapeEnabledColumn);
attributeSetterBiConsumers.put(
"autoEscapeDisabledColumn",
(BiConsumer<AutoEscapeEntry, String>)
AutoEscapeEntry::setAutoEscapeDisabledColumn);
attributeSetterBiConsumers.put(
"autoEscapeEnabledColumn",
(BiConsumer<AutoEscapeEntry, String>)
AutoEscapeEntry::setAutoEscapeEnabledColumn);

_attributeSetterBiConsumers = Collections.unmodifiableMap(
(Map)attributeSetterBiConsumers);
Expand All @@ -273,41 +273,41 @@ public void setAutoEscapeEntryId(long autoEscapeEntryId) {
}

@Override
public String getAutoEscapeEnabledColumn() {
if (_autoEscapeEnabledColumn == null) {
public String getAutoEscapeDisabledColumn() {
if (_autoEscapeDisabledColumn == null) {
return "";
}
else {
return _autoEscapeEnabledColumn;
return _autoEscapeDisabledColumn;
}
}

@Override
public void setAutoEscapeEnabledColumn(String autoEscapeEnabledColumn) {
public void setAutoEscapeDisabledColumn(String autoEscapeDisabledColumn) {
if (_columnOriginalValues == Collections.EMPTY_MAP) {
_setColumnOriginalValues();
}

_autoEscapeEnabledColumn = autoEscapeEnabledColumn;
_autoEscapeDisabledColumn = autoEscapeDisabledColumn;
}

@Override
public String getAutoEscapeDisabledColumn() {
if (_autoEscapeDisabledColumn == null) {
public String getAutoEscapeEnabledColumn() {
if (_autoEscapeEnabledColumn == null) {
return "";
}
else {
return _autoEscapeDisabledColumn;
return _autoEscapeEnabledColumn;
}
}

@Override
public void setAutoEscapeDisabledColumn(String autoEscapeDisabledColumn) {
public void setAutoEscapeEnabledColumn(String autoEscapeEnabledColumn) {
if (_columnOriginalValues == Collections.EMPTY_MAP) {
_setColumnOriginalValues();
}

_autoEscapeDisabledColumn = autoEscapeDisabledColumn;
_autoEscapeEnabledColumn = autoEscapeEnabledColumn;
}

public long getColumnBitmask() {
Expand Down Expand Up @@ -367,10 +367,10 @@ public Object clone() {
AutoEscapeEntryImpl autoEscapeEntryImpl = new AutoEscapeEntryImpl();

autoEscapeEntryImpl.setAutoEscapeEntryId(getAutoEscapeEntryId());
autoEscapeEntryImpl.setAutoEscapeEnabledColumn(
getAutoEscapeEnabledColumn());
autoEscapeEntryImpl.setAutoEscapeDisabledColumn(
getAutoEscapeDisabledColumn());
autoEscapeEntryImpl.setAutoEscapeEnabledColumn(
getAutoEscapeEnabledColumn());

autoEscapeEntryImpl.resetOriginalValues();

Expand All @@ -383,10 +383,10 @@ public AutoEscapeEntry cloneWithOriginalValues() {

autoEscapeEntryImpl.setAutoEscapeEntryId(
this.<Long>getColumnOriginalValue("autoEscapeEntryId"));
autoEscapeEntryImpl.setAutoEscapeEnabledColumn(
this.<String>getColumnOriginalValue("autoEscapeEnabledColumn"));
autoEscapeEntryImpl.setAutoEscapeDisabledColumn(
this.<String>getColumnOriginalValue("autoEscapeDisabledColumn"));
autoEscapeEntryImpl.setAutoEscapeEnabledColumn(
this.<String>getColumnOriginalValue("autoEscapeEnabledColumn"));

return autoEscapeEntryImpl;
}
Expand Down Expand Up @@ -465,18 +465,6 @@ public CacheModel<AutoEscapeEntry> toCacheModel() {

autoEscapeEntryCacheModel.autoEscapeEntryId = getAutoEscapeEntryId();

autoEscapeEntryCacheModel.autoEscapeEnabledColumn =
getAutoEscapeEnabledColumn();

String autoEscapeEnabledColumn =
autoEscapeEntryCacheModel.autoEscapeEnabledColumn;

if ((autoEscapeEnabledColumn != null) &&
(autoEscapeEnabledColumn.length() == 0)) {

autoEscapeEntryCacheModel.autoEscapeEnabledColumn = null;
}

autoEscapeEntryCacheModel.autoEscapeDisabledColumn =
getAutoEscapeDisabledColumn();

Expand All @@ -489,6 +477,18 @@ public CacheModel<AutoEscapeEntry> toCacheModel() {
autoEscapeEntryCacheModel.autoEscapeDisabledColumn = null;
}

autoEscapeEntryCacheModel.autoEscapeEnabledColumn =
getAutoEscapeEnabledColumn();

String autoEscapeEnabledColumn =
autoEscapeEntryCacheModel.autoEscapeEnabledColumn;

if ((autoEscapeEnabledColumn != null) &&
(autoEscapeEnabledColumn.length() == 0)) {

autoEscapeEntryCacheModel.autoEscapeEnabledColumn = null;
}

return autoEscapeEntryCacheModel;
}

Expand Down Expand Up @@ -551,8 +551,8 @@ private static class EscapedModelProxyProviderFunctionHolder {
}

private long _autoEscapeEntryId;
private String _autoEscapeEnabledColumn;
private String _autoEscapeDisabledColumn;
private String _autoEscapeEnabledColumn;

public <T> T getColumnValue(String columnName) {
Function<AutoEscapeEntry, Object> function =
Expand Down Expand Up @@ -583,10 +583,10 @@ private void _setColumnOriginalValues() {
_columnOriginalValues = new HashMap<String, Object>();

_columnOriginalValues.put("autoEscapeEntryId", _autoEscapeEntryId);
_columnOriginalValues.put(
"autoEscapeEnabledColumn", _autoEscapeEnabledColumn);
_columnOriginalValues.put(
"autoEscapeDisabledColumn", _autoEscapeDisabledColumn);
_columnOriginalValues.put(
"autoEscapeEnabledColumn", _autoEscapeEnabledColumn);
}

private transient Map<String, Object> _columnOriginalValues;
Expand All @@ -602,9 +602,9 @@ public static long getColumnBitmask(String columnName) {

columnBitmasks.put("autoEscapeEntryId", 1L);

columnBitmasks.put("autoEscapeEnabledColumn", 2L);
columnBitmasks.put("autoEscapeDisabledColumn", 2L);

columnBitmasks.put("autoEscapeDisabledColumn", 4L);
columnBitmasks.put("autoEscapeEnabledColumn", 4L);

_columnBitmasks = Collections.unmodifiableMap(columnBitmasks);
}
Expand Down
Loading

0 comments on commit 67b5d07

Please sign in to comment.