You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2024/01/12 12:20:27 UTC
(jena) 02/05: Fixing string format/logging parameter mismatches.
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit e16daf4801be074965a120fb14f90faa731bc4c0
Author: TelicentPaul <pa...@telicent.io>
AuthorDate: Wed Jan 10 12:03:33 2024 +0000
Fixing string format/logging parameter mismatches.
---
.../main/java/org/apache/jena/sparql/function/library/execTime.java | 2 +-
.../test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java | 2 +-
jena-core/src/main/java/org/apache/jena/graph/TextDirection.java | 2 +-
.../java/org/apache/jena/dboe/trans/data/TransBinaryDataFile.java | 2 +-
.../main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java | 2 +-
.../src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java | 4 ++--
jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdFactory.java | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/execTime.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/execTime.java
index bfb5a750f0..1458d96bd9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/execTime.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/execTime.java
@@ -46,7 +46,7 @@ public class execTime extends FunctionBase {
if ( ! str.isEmpty() )
System.err.printf("%s : %d ms\n",str, System.currentTimeMillis()) ;
else
- System.err.printf("---- %d ms\n",str, System.currentTimeMillis()) ;
+ System.err.printf("---- %d ms\n", System.currentTimeMillis()) ;
lastms = now ;
return NodeValue.TRUE ;
}
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java
index bed123d96c..c9edf7e1d7 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/rdfxml/rrx/RunTestRDFXML.java
@@ -260,7 +260,7 @@ public class RunTestRDFXML {
public String summary() {
if ( fatals.isEmpty() )
- return format("E:%d W:%d", errors.size(), warnings.size(), fatals.size());
+ return format("E:%d W:%d", errors.size(), warnings.size());
return format("E:%d W:%d F:%d", errors.size(), warnings.size(), fatals.size());
}
diff --git a/jena-core/src/main/java/org/apache/jena/graph/TextDirection.java b/jena-core/src/main/java/org/apache/jena/graph/TextDirection.java
index 09c109ff5b..f64c248ce2 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/TextDirection.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/TextDirection.java
@@ -49,7 +49,7 @@ public enum TextDirection {
case "ltr" -> LTR;
case "rtl"-> RTL;
default ->
- throw new JenaException(String .format("Initial text direction must be 'ltr' or 'rtl'", RDF.dirLTR, RDF.dirRTL));
+ throw new JenaException("Initial text direction must be 'ltr' or 'rtl'");
};
}
}
diff --git a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/data/TransBinaryDataFile.java b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/data/TransBinaryDataFile.java
index ce397438dd..b27ea75b8c 100644
--- a/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/data/TransBinaryDataFile.java
+++ b/jena-db/jena-dboe-trans-data/src/main/java/org/apache/jena/dboe/trans/data/TransBinaryDataFile.java
@@ -166,7 +166,7 @@ public class TransBinaryDataFile extends TransactionalComponentLifecycle<TransBi
// Internal consistency check.
// (Abort after commit would trigger the warning.)
if ( txnResetState.length != x )
- Log.warn(this, format("Mismatch: state.length = %d, committedLength = %d", txnResetState.length != x));
+ Log.warn(this, format("Mismatch: state.length = %d, committedLength = %d", txnResetState.length, x));
binFile.truncate(x);
binFile.sync();
}
diff --git a/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java
index b109aba8f4..765f621c5f 100644
--- a/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java
+++ b/jena-fuseki2/jena-fuseki-geosparql/src/main/java/org/apache/jena/fuseki/geosparql/DatasetOperations.java
@@ -165,7 +165,7 @@ public class DatasetOperations {
LOGGER.info("Reading RDF - Completed - File: {}, Graph Name: {}, RDF Format: {}", rdfFile, graphName, rdfFormat);
} else {
dataset.abort();
- LOGGER.info("Reading RDF - Not Completed - File: {} does not exist", rdfFile, graphName, rdfFormat);
+ LOGGER.info("Reading RDF - Not Completed - File: {} does not exist", rdfFile);
}
}
} catch (Throwable ex) {
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
index e62215c495..a4a0c23c25 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
@@ -370,7 +370,7 @@ public class ActionDatasets extends ActionContainerItem {
if ( configurationFiles.isEmpty() ) {
// ---- Unmanaged
- action.log.warn(format("[%d] Can't delete database configuration - not a managed database", action.id, name));
+ action.log.warn(format("[%d] Can't delete database configuration - not a managed database; dataset=%s", action.id, name));
// ServletOps.errorOccurred(format("Can't delete database - not a managed configuration", name));
systemDSG.commit();
committed = true;
@@ -417,7 +417,7 @@ public class ActionDatasets extends ActionContainerItem {
if ( Files.exists(pDatabase)) {
try {
if ( Files.isSymbolicLink(pDatabase)) {
- action.log.info(format("[%d] Database is a symbolic link, not removing files", action.id, pDatabase));
+ action.log.info(format("[%d] Database is a symbolic link, not removing files %s", action.id, pDatabase));
} else {
IO.deleteAll(pDatabase);
action.log.info(format("[%d] Deleted database files %s", action.id, pDatabase));
diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdFactory.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdFactory.java
index 1e9a877523..da42c4307e 100644
--- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdFactory.java
+++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/NodeIdFactory.java
@@ -92,7 +92,7 @@ public class NodeIdFactory
v2 = BitsLong.clear(v2, 56, 64);
NodeIdType type = NodeIdType.intToEnum(t);
if ( type == NodeIdType.SPECIAL )
- throw new TDBException(String.format("Attempt to create a special from a long: 0x%016", v2));
+ throw new TDBException(String.format("Attempt to create a special from a long: 0x%016X", v2));
return NodeId.createRaw(type, v2);
}
@@ -102,7 +102,7 @@ public class NodeIdFactory
int t = v1 >> 24;
NodeIdType type = NodeIdType.intToEnum(t);
if ( type == NodeIdType.SPECIAL )
- throw new TDBException(String.format("Attempt to create a special from a long: 0x%016", v2));
+ throw new TDBException(String.format("Attempt to create a special from a long: 0x%016X", v2));
return createNew(type, 0, v2);
}