Skip to content

Commit a753878

Browse files
andrusandrus
committed
Canonicalizing logger parameters
1 parent dccb5d9 commit a753878

48 files changed

Lines changed: 91 additions & 120 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ protected Writer openWriter(TemplateType templateType) throws Exception {
310310

311311
if (logger != null) {
312312
String label = templateType.isSuperclass() ? "superclass" : "class";
313-
logger.info("Generating " + label + " file: " + outFile.getCanonicalPath());
313+
logger.info("Generating {} file: {}", label, outFile.getCanonicalPath());
314314
}
315315

316316
// return writer with specified encoding

‎cayenne-cgen/src/main/java/org/apache/cayenne/gen/PropertyUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ public PropertyDescriptor getPropertyDescriptor(String attrType) {
383383
}
384384
} catch (DIRuntimeException ex) {
385385
if(logger != null) {
386-
logger.warn("WARN: Class not found: " + attrType + ". Will use default PropertyDescriptor.");
386+
logger.warn("WARN: Class not found: {}. Will use default PropertyDescriptor.", attrType);
387387
}
388388
return PropertyDescriptor.defaultDescriptor();
389389
}

‎cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/value/DefaultValueTransformerFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ protected String getJavaType(DbAttribute a) {
171171
String attributeName = dbEntity.getName() + "." + a.getName();
172172
String msg = javaTypes.size() > 1 ? "ObjAttributes with different java types" : "No ObjAttributes";
173173
// Warn user about this problem as there is nothing else we can do
174-
LOGGER.warn(msg + " bound to DbAttribute '" + attributeName + "', " + javaType + " type will be used.");
174+
LOGGER.warn("{} bound to DbAttribute '{}', {} type will be used.", msg, attributeName, javaType);
175175
return javaType;
176176
}
177177

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/filter/NamePatternMatcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static Pattern[] createPatterns(Logger logger, String patternString) {
8282
} catch (PatternSyntaxException e) {
8383

8484
if (logger != null) {
85-
logger.warn("Ignoring invalid pattern [" + patternString1 + "], reason: " + e.getMessage());
85+
logger.warn("Ignoring invalid pattern [{}], reason: {}", patternString1, e.getMessage());
8686
}
8787
}
8888
}

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ private void addMissingRelationship(ObjEntity entity, DbRelationship dbRelations
257257
if (dbRelationship.getTargetEntityName() != null) {
258258
boolean needGeneratedEntity = createObjRelationship(entity, dbRelationship, nameGenerator.objEntityName(targetEntity));
259259
if (needGeneratedEntity) {
260-
LOGGER.warn("Can't find ObjEntity for " + dbRelationship.getTargetEntityName());
261-
LOGGER.warn("Db Relationship (" + dbRelationship + ") will have GUESSED Obj Relationship reflection. ");
260+
LOGGER.warn("Can't find ObjEntity for {}", dbRelationship.getTargetEntityName());
261+
LOGGER.warn("Db Relationship ({}) will have GUESSED Obj Relationship reflection. ", dbRelationship);
262262
}
263263
}
264264
} else {

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,8 @@ protected void commit(DbImportConfiguration config, DataMap sourceDataMap) throw
171171

172172
protected DataMap loadDataMap(DbImportConfiguration config) throws Exception {
173173

174-
if (logger.isDebugEnabled()) {
175-
logger.debug("DB connection: " + config.getDataSourceInfo());
176-
logger.debug(String.valueOf(config));
177-
}
174+
logger.debug("DB connection: {}", config.getDataSourceInfo());
175+
logger.debug("{}", config);
178176

179177
DataNodeDescriptor dataNodeDescriptor = config.createDataNodeDescriptor();
180178
DataSource dataSource = dataSourceFactory.getDataSource(dataNodeDescriptor);
@@ -204,7 +202,7 @@ protected DataMap loadDataMap(DbImportConfiguration config) throws Exception {
204202
String path = config.getTargetDataMap() == null ? "null" : config.getTargetDataMap().getAbsolutePath() + "'";
205203

206204
logger.info("");
207-
logger.info("Map file does not exist. Loaded db model will be saved into '" + path);
205+
logger.info("Map file does not exist. Loaded db model will be saved into '{}", path);
208206

209207
hasChanges = true;
210208
targetDataMap = newTargetDataMap(config);
@@ -303,7 +301,7 @@ private void relationshipsSanity(DataMap executed) {
303301
List<ObjRelationship> rels = new LinkedList<>(objEntity.getRelationships());
304302
for (ObjRelationship rel : rels) {
305303
if (rel.getSourceEntity() == null || rel.getTargetEntity() == null) {
306-
logger.error("Incorrect obj relationship source or target entity is null: " + rel);
304+
logger.error("Incorrect obj relationship source or target entity is null: {}", rel);
307305

308306
objEntity.removeRelationship(rel.getName());
309307
}
@@ -481,7 +479,7 @@ protected void saveLoaded(DataMap dataMap, DbImportConfiguration config) throws
481479
dataChannelDescriptor = new DataChannelDescriptor();
482480
dataChannelDescriptor.setName(getProjectNameFromFileName(config.getCayenneProject().getName()));
483481
dataChannelDescriptor.setConfigurationSource(new URLResource(config.getCayenneProject().toURI().toURL()));
484-
logger.info("Project file does not exist. New project will be saved into '" + config.getCayenneProject().getAbsolutePath());
482+
logger.info("Project file does not exist. New project will be saved into '{}", config.getCayenneProject().getAbsolutePath());
485483
}
486484

487485
dataChannelDescriptor.getDataMaps().add(dataMap);

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeProcessor.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,8 @@ void processAttribute(ResultSet rs, PatternFilter columnFilter, DbEntity entity)
6868

6969
String columnName = rs.getString("COLUMN_NAME");
7070
if (columnFilter == null || !columnFilter.isIncluded(columnName)) {
71-
if (LOGGER.isDebugEnabled()) {
72-
LOGGER.debug("Skip column '" + entity.getName() + "." + columnName +
73-
"' (Path: " + entity.getCatalog() + "/" + entity.getSchema() + "; Filter: " + columnFilter + ")");
74-
}
71+
LOGGER.debug("Skip column '{}.{}' (Path: {}/{}; Filter: {})",
72+
entity.getName(), columnName, entity.getCatalog(), entity.getSchema(), columnFilter);
7573
return;
7674
}
7775

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ protected void processResultSetRow(CatalogFilter catalog, SchemaFilter schema, D
6767

6868
if (!(catalog.name == null || catalog.name.equals(catalogName))
6969
|| !(schema.name == null || schema.name.equals(schemaName))) {
70-
LOGGER.error(catalogName + "." + schema + "." + schemaName + " wrongly loaded for catalog/schema : "
71-
+ catalog.name + "." + schema.name);
70+
LOGGER.error("{}.{}.{} wrongly loaded for catalog/schema : {}.{}",
71+
catalogName, schema, schemaName, catalog.name, schema.name);
7272
return;
7373
}
7474

@@ -82,7 +82,7 @@ protected void processResultSetRow(CatalogFilter catalog, SchemaFilter schema, D
8282
private void addDbEntityToMap(DetectedDbEntity table, DbLoadDataStore map) {
8383
DbEntity oldEnt = map.addDbEntitySafe(table);
8484
if (oldEnt != null) {
85-
LOGGER.warn("Overwrite DbEntity: " + oldEnt.getName());
85+
LOGGER.warn("Overwrite DbEntity: {}", oldEnt.getName());
8686
delegate.dbEntityRemoved(oldEnt);
8787
}
8888
delegate.dbEntityAdded(table);

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoader.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ boolean shouldLoad(DbEntity entity) {
4545

4646
@Override
4747
boolean catchException(DbEntity entity, SQLException ex) {
48-
LOGGER.info("Error getting relationships for '"
49-
+ entity.getCatalog() + "." + entity.getSchema()
50-
+ "', ignoring. " + ex.getMessage(), ex);
48+
LOGGER.info("Error getting relationships for '{}.{}', ignoring. {}",
49+
entity.getCatalog(), entity.getSchema(), ex.getMessage(), ex);
5150
return true;
5251
}
5352

@@ -62,13 +61,13 @@ void processResultSet(DbEntity dbEntity, DbLoadDataStore map, ResultSet rs) thro
6261

6362
DbEntity pkEntity = map.getDbEntity(key.getPk().getTable());
6463
if (!key.getPk().validateEntity(pkEntity)) {
65-
LOGGER.info("Skip relation: '" + key + "' because table '" + key.getPk().getTable() + "' is not found or in different catalog/schema");
64+
LOGGER.info("Skip relation: '{}' because table '{}' is not found or in different catalog/schema", key, key.getPk().getTable());
6665
return;
6766
}
6867

6968
DbEntity fkEntity = map.getDbEntity(key.getFk().getTable());
7069
if (!key.getFk().validateEntity(fkEntity)) {
71-
LOGGER.info("Skip relation: '" + key + "' because table '" + key.getFk().getTable() + "' is not found or in different catalog/schema");
70+
LOGGER.info("Skip relation: '{}' because table '{}' is not found or in different catalog/schema", key, key.getFk().getTable());
7271
return;
7372
}
7473

‎cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,24 @@ public LoggingDbLoaderDelegate(Logger logger) {
3535

3636
@Override
3737
public void dbEntityAdded(DbEntity entity) {
38-
logger.info(" Table: " + entity.getFullyQualifiedName());
38+
logger.info(" Table: {}", entity.getFullyQualifiedName());
3939
}
4040

4141
@Override
4242
public void dbEntityRemoved(DbEntity entity) {
43-
logger.info(" Table removed: " + entity.getFullyQualifiedName());
43+
logger.info(" Table removed: {}", entity.getFullyQualifiedName());
4444
}
4545

4646
@Override
4747
public boolean dbRelationship(DbEntity entity) {
48-
if (logger.isDebugEnabled()) {
49-
logger.debug(" Relationships for " + entity.getFullyQualifiedName());
50-
}
48+
logger.debug(" Relationships for {}", entity.getFullyQualifiedName());
5149

5250
return true;
5351
}
5452

5553
@Override
5654
public boolean dbRelationshipLoaded(DbEntity entity, DbRelationship relationship) {
57-
logger.info(" " + relationship);
55+
logger.info(" {}", relationship);
5856

5957
return true;
6058
}

0 commit comments

Comments
 (0)
⚡