Skip to content

Commit

Permalink
Ran spotlessApply
Browse files Browse the repository at this point in the history
  • Loading branch information
@evan-miller-jumpmind
evan-miller-jumpmind committed Mar 27, 2024
1 parent e41c216 commit 9cbe878
Show file tree
Hide file tree
Showing 11 changed files with 91 additions and 99 deletions.
1 change: 1 addition & 0 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/ase/AseTriggerTemplate.java
View file
Expand Up @@ -38,6 +38,7 @@

public class AseTriggerTemplate extends AbstractTriggerTemplate {
private int pagesize;

public AseTriggerTemplate(ISymmetricDialect symmetricDialect) {
super(symmetricDialect);
pagesize = ((AseSymmetricDialect) symmetricDialect).getPageSize();
Expand Down
4 changes: 2 additions & 2 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java
View file
Expand Up @@ -115,8 +115,8 @@ protected boolean useTriggerTemplateForColumnTemplatesDuringInitialLoad(Column c
return true;
}
String typeName = column.getJdbcTypeName();
if(typeName.equalsIgnoreCase("unichar") || typeName.equalsIgnoreCase("univarchar") || typeName.equalsIgnoreCase("unitext")) {
return true;
if (typeName.equalsIgnoreCase("unichar") || typeName.equalsIgnoreCase("univarchar") || typeName.equalsIgnoreCase("unitext")) {
return true;
}
int type = column.getJdbcTypeCode();
// These column types can be selected directly without a template
Expand Down
87 changes: 42 additions & 45 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbCompare.java
View file
Expand Up @@ -187,9 +187,8 @@ protected TableReport compareTables(DbCompareTables tables, OutputStream sqlDiff
Map<Column, String> deltas = sourceCompareRow.compareTo(tables, targetCompareRow);
Map<Column, String> deltasCopy = new LinkedHashMap<Column, String>();
for (Column column : deltas.keySet()) {
deltasCopy.put((Column)column.clone(), deltas.get(column));
deltasCopy.put((Column) column.clone(), deltas.get(column));
}

if (deltas.isEmpty()) {
tableReport.countMatchedRow();
} else {
Expand Down Expand Up @@ -283,49 +282,47 @@ protected String getTargetComparisonSQL(DbCompareTables tables, IDatabasePlatfor
return sql;
}

protected String getComparisonSQL(Table table, Column[] sortByColumns, IDatabasePlatform platform,
String whereClause, boolean isSource) {

DmlStatement statement = platform.createDmlStatement(DmlType.SELECT, table.getCatalog(), table.getSchema(),
table.getName(), null, table.getColumns(), null, null);
StringBuilder sql = new StringBuilder(statement.getSql());
String sybaseUnitypeConversions = statement.getSql();
boolean isUsingUnitypes = false;
if (platform.getSqlTemplate().toString().contains("ase")) {
if (isSource) {
ISymmetricDialect symmetricDialect = sourceEngine.getSymmetricDialect();
isUsingUnitypes = symmetricDialect.getParameterService()
.is(ParameterConstants.DBDIALECT_SYBASE_ASE_CONVERT_UNITYPES_FOR_SYNC);
} else {
ISymmetricDialect symmetricDialect = targetEngine.getSymmetricDialect();
isUsingUnitypes = symmetricDialect.getParameterService()
.is(ParameterConstants.DBDIALECT_SYBASE_ASE_CONVERT_UNITYPES_FOR_SYNC);
}
if (isUsingUnitypes) {
for(Column column : statement.getColumns()) {
if(column.getJdbcTypeName().equalsIgnoreCase("unichar") ||
column.getJdbcTypeName().equalsIgnoreCase("univarchar") ||
column.getJdbcTypeName().equalsIgnoreCase("unitext")) {
sybaseUnitypeConversions = sybaseUnitypeConversions.replace(column.getName() + ",","case when " + column.getName() + " is null then null else '\"' +\n"
+ " bintostr(convert(varbinary(16384),"+column.getName()+")) + '\"' end as " +column.getName() + "," );

}
}

}
}
StringBuilder finalSql = null;
if(isUsingUnitypes) {
finalSql = new StringBuilder(sybaseUnitypeConversions.toString());
} else {
finalSql = new StringBuilder(sql.toString());
}
finalSql.setLength(finalSql.length() - "where ".length()); // remove the trailing where so we can insert a table alias.
finalSql.append(" t where "); // main table alias.
finalSql.append(whereClause).append(" ");
finalSql.append(buildOrderBy(table, sortByColumns, platform, isSource));
return finalSql.toString();
}
protected String getComparisonSQL(Table table, Column[] sortByColumns, IDatabasePlatform platform,
String whereClause, boolean isSource) {
DmlStatement statement = platform.createDmlStatement(DmlType.SELECT, table.getCatalog(), table.getSchema(),
table.getName(), null, table.getColumns(), null, null);
StringBuilder sql = new StringBuilder(statement.getSql());
String sybaseUnitypeConversions = statement.getSql();
boolean isUsingUnitypes = false;
if (platform.getSqlTemplate().toString().contains("ase")) {
if (isSource) {
ISymmetricDialect symmetricDialect = sourceEngine.getSymmetricDialect();
isUsingUnitypes = symmetricDialect.getParameterService()
.is(ParameterConstants.DBDIALECT_SYBASE_ASE_CONVERT_UNITYPES_FOR_SYNC);
} else {
ISymmetricDialect symmetricDialect = targetEngine.getSymmetricDialect();
isUsingUnitypes = symmetricDialect.getParameterService()
.is(ParameterConstants.DBDIALECT_SYBASE_ASE_CONVERT_UNITYPES_FOR_SYNC);
}
if (isUsingUnitypes) {
for (Column column : statement.getColumns()) {
if (column.getJdbcTypeName().equalsIgnoreCase("unichar") ||
column.getJdbcTypeName().equalsIgnoreCase("univarchar") ||
column.getJdbcTypeName().equalsIgnoreCase("unitext")) {
sybaseUnitypeConversions = sybaseUnitypeConversions.replace(column.getName() + ",", "case when " + column.getName()
+ " is null then null else '\"' +\n"
+ " bintostr(convert(varbinary(16384)," + column.getName() + ")) + '\"' end as " + column.getName() + ",");
}
}
}
}
StringBuilder finalSql = null;
if (isUsingUnitypes) {
finalSql = new StringBuilder(sybaseUnitypeConversions.toString());
} else {
finalSql = new StringBuilder(sql.toString());
}
finalSql.setLength(finalSql.length() - "where ".length()); // remove the trailing where so we can insert a table alias.
finalSql.append(" t where "); // main table alias.
finalSql.append(whereClause).append(" ");
finalSql.append(buildOrderBy(table, sortByColumns, platform, isSource));
return finalSql.toString();
}

protected String buildOrderBy(Table table, Column[] sortByColumns, IDatabasePlatform platform, boolean isSource) {
DatabaseInfo databaseInfo = platform.getDatabaseInfo();
Expand Down
26 changes: 13 additions & 13 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/io/DbValueComparator.java
View file
Expand Up @@ -67,7 +67,7 @@ public int compareValues(Column sourceColumn, Column targetColumn, String source
return 0;
}
if (sourceColumn.isOfTextType()) {
if(targetColumn.getJdbcTypeName().equalsIgnoreCase("univarchar") ||
if (targetColumn.getJdbcTypeName().equalsIgnoreCase("univarchar") ||
targetColumn.getJdbcTypeName().equalsIgnoreCase("unichar") ||
targetColumn.getJdbcTypeName().equalsIgnoreCase("unitext")) {
targetValue = convertString(targetValue);
Expand All @@ -81,19 +81,19 @@ public int compareValues(Column sourceColumn, Column targetColumn, String source
return compareDefault(sourceColumn, targetColumn, sourceValue, targetValue);
}
}

protected String convertString(String string) {
String utf8String = null;
try {
string = new String(Hex.decodeHex(string));
if(string.contains("\"")) {
string = string.substring(1,string.length()-1);
}
string = "fffe" + string;
utf8String = new String(Hex.decodeHex(string), "UTF-16");
} catch (DecoderException | UnsupportedEncodingException e) {
e.printStackTrace();
}
String utf8String = null;
try {
string = new String(Hex.decodeHex(string));
if (string.contains("\"")) {
string = string.substring(1, string.length() - 1);
}
string = "fffe" + string;
utf8String = new String(Hex.decodeHex(string), "UTF-16");
} catch (DecoderException | UnsupportedEncodingException e) {
e.printStackTrace();
}
return utf8String;
}

Expand Down
14 changes: 7 additions & 7 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/model/TriggerRouter.java
View file
Expand Up @@ -44,7 +44,7 @@ public class TriggerRouter implements IModelObject, Cloneable {
private String lastUpdateBy;
private boolean pingBackEnabled = false;
private String dataRefreshType;

public TriggerRouter() {
this(new Trigger(), new Router());
}
Expand Down Expand Up @@ -129,14 +129,14 @@ public void setInitialLoadDeleteStmt(String initialLoadDeleteStmt) {
}

public String getDataRefreshType() {
return dataRefreshType;
}
return dataRefreshType;
}

public void setDataRefreshType(String dataRefreshType) {
this.dataRefreshType = dataRefreshType;
}
public void setDataRefreshType(String dataRefreshType) {
this.dataRefreshType = dataRefreshType;
}

public boolean isRouted(DataEventType event) {
public boolean isRouted(DataEventType event) {
switch (event) {
case INSERT:
return router.isSyncOnInsert();
Expand Down
10 changes: 5 additions & 5 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/route/FileSyncDataRouter.java
View file
Expand Up @@ -119,16 +119,16 @@ public Set<String> routeToNodes(SimpleRouterContext context, DataMetaData dataMe
}
return nodeIds;
}

private String getTopRelativeDir(String relativeDir) {
String topRelativeDir = null;
if (relativeDir != null) {
relativeDir = relativeDir.replace('\\','/');
relativeDir = relativeDir.replace('\\', '/');
topRelativeDir = (relativeDir.contains("/") ? relativeDir.substring(0, relativeDir.indexOf('/')) : relativeDir);
}
return topRelativeDir;
}

private void addTopRelativeDirToData(String topRelativeDir, DataMetaData dataMetaData) {
Table copy;
try {
Expand All @@ -143,14 +143,14 @@ private void addTopRelativeDirToData(String topRelativeDir, DataMetaData dataMet
String newData = data.getCsvData(Data.ROW_DATA);
if (oldData != null) {
oldData = oldData.concat(",");
if (! StringUtils.isBlank(oldData)) {
if (!StringUtils.isBlank(oldData)) {
oldData = oldData.concat("\"").concat(topRelativeDir).concat("\"");
}
data.putCsvData(Data.OLD_DATA, oldData);
}
if (newData != null) {
newData = newData.concat(",");
if (! StringUtils.isBlank(newData)) {
if (!StringUtils.isBlank(newData)) {
newData = newData.concat("\"").concat(topRelativeDir).concat("\"");
}
data.putCsvData(Data.ROW_DATA, newData);
Expand Down
1 change: 0 additions & 1 deletion symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java
View file
Expand Up @@ -48,7 +48,6 @@
import static org.jumpmind.symmetric.service.ClusterConstants.TYPE_SHARED;
import static org.jumpmind.symmetric.service.ClusterConstants.WATCHDOG;


import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
Expand Down
12 changes: 3 additions & 9 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncService.java
View file
Expand Up @@ -889,15 +889,9 @@ public void execute(NodeCommunication nodeCommunication, RemoteNodeStatus status
}
lastBatchesProcessed = status.getBatchesProcessed() - cumulativeBatchesProcessed;
cumulativeBatchesProcessed = status.getBatchesProcessed();
} while (
(!status.failed()) &&
(
(
(isFilePull && immediatePullIfDataFound) || (isFilePush && immediatePushIfDataFound)
)
&& lastBatchesProcessed > 0
)
);
} while ((!status.failed()) &&
(((isFilePull && immediatePullIfDataFound) || (isFilePush && immediatePushIfDataFound))
&& lastBatchesProcessed > 0));
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/InitialLoadService.java
View file
Expand Up @@ -117,7 +117,8 @@ public void cancelLoad(TableReloadStatus status) {
for (int i = 0; i < 10; i++) {
try {
Thread.sleep(500l);
} catch (InterruptedException e) {}
} catch (InterruptedException e) {
}
ListIterator<ProcessInfo> iterator = infosToWaitFor.listIterator();
while (iterator.hasNext()) {
ProcessInfo p = iterator.next();
Expand Down
14 changes: 7 additions & 7 deletions symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/reader/ExtractDataReader.java
View file
Expand Up @@ -247,13 +247,13 @@ protected CsvData convertUtf16toUTF8(Table table, CsvData data) {
int index = ArrayUtils.indexOf(columnNames, uniColumn.getName());
if (rowData[index] != null) {
String utf16String = null;
// if (batch.getChannelId().equalsIgnoreCase("reload")) {
// utf16String = new String(Hex.decodeHex(rowData[index]), "UTF-16");
// } else {
String baseString = rowData[index];
baseString = "fffe" + baseString;
utf16String = new String(Hex.decodeHex(baseString), "UTF-16");
// }
// if (batch.getChannelId().equalsIgnoreCase("reload")) {
// utf16String = new String(Hex.decodeHex(rowData[index]), "UTF-16");
// } else {
String baseString = rowData[index];
baseString = "fffe" + baseString;
utf16String = new String(Hex.decodeHex(baseString), "UTF-16");
// }
String utf8String = new String(utf16String.getBytes(Charset.defaultCharset()), Charset.defaultCharset());
rowData[index] = utf8String;
}
Expand Down
18 changes: 9 additions & 9 deletions symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybaseJdbcSqlTemplate.java
View file
Expand Up @@ -58,8 +58,8 @@ public SybaseJdbcSqlTemplate(DataSource dataSource, SqlTemplateSettings settings
try {
c = dataSource.getConnection();
jdbcMajorVersion = c.getMetaData().getJDBCMajorVersion();
if(dataSource.getConnection().getMetaData().getURL().contains("jtds")) {
isUsingJtds = true;
if (dataSource.getConnection().getMetaData().getURL().contains("jtds")) {
isUsingJtds = true;
}
} catch (SQLException ex) {
jdbcMajorVersion = -1;
Expand Down Expand Up @@ -176,13 +176,13 @@ public void setValues(PreparedStatement ps, Object[] args)
}

public boolean supportsGetGeneratedKeys() {
//needs to return true for jtds
if(jdbcMajorVersion >=4 || isUsingJtds) {
return true;
} else {
return false;
}
// return jdbcMajorVersion >= 4;
// needs to return true for jtds
if (jdbcMajorVersion >= 4 || isUsingJtds) {
return true;
} else {
return false;
}
// return jdbcMajorVersion >= 4;
}

protected String getSelectLastInsertIdSql(String sequenceName) {
Expand Down

0 comments on commit 9cbe878

Please sign in to comment.