Skip to content

Commit cb30c11

Browse files
tballisontballison
committed
TIKA-4840: route plugin configs through PluginJson.read; drop mapper()
1 parent 2de3d94 commit cb30c11

34 files changed

Lines changed: 44 additions & 379 deletions

File tree

‎tika-pipes/tika-pipes-plugins/tika-pipes-atlassian-jwt/src/main/java/org/apache/tika/pipes/fetcher/atlassianjwt/config/AtlassianJwtFetcherConfig.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,14 @@
2121
import java.util.List;
2222
import java.util.Map;
2323

24-
import com.fasterxml.jackson.core.JsonProcessingException;
25-
import com.fasterxml.jackson.databind.ObjectMapper;
26-
2724
import org.apache.tika.exception.TikaConfigException;
2825
import org.apache.tika.plugins.PluginJson;
2926

3027
public class AtlassianJwtFetcherConfig {
3128

32-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
33-
3429
public static AtlassianJwtFetcherConfig load(final String json)
3530
throws TikaConfigException {
36-
try {
37-
return OBJECT_MAPPER.readValue(json, AtlassianJwtFetcherConfig.class);
38-
} catch (JsonProcessingException e) {
39-
throw new TikaConfigException(
40-
"Failed to parse AtlassianJwtFetcherConfig from JSON", e);
41-
}
31+
return PluginJson.read(json, AtlassianJwtFetcherConfig.class);
4232
}
4333

4434
private Integer maxConnectionsPerRoute = 1000;

‎tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/emitter/azblob/AZBlobEmitterConfig.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
package org.apache.tika.pipes.emitter.azblob;
1818

1919
import com.fasterxml.jackson.annotation.JsonProperty;
20-
import com.fasterxml.jackson.core.JsonProcessingException;
21-
import com.fasterxml.jackson.databind.ObjectMapper;
2220

2321
import org.apache.tika.exception.TikaConfigException;
2422
import org.apache.tika.plugins.PluginJson;
@@ -32,16 +30,9 @@ public record AZBlobEmitterConfig(
3230
@JsonProperty(defaultValue = "false") boolean overwriteExisting
3331
) {
3432

35-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
36-
3733
public static AZBlobEmitterConfig load(final String json)
3834
throws TikaConfigException {
39-
try {
40-
return OBJECT_MAPPER.readValue(json, AZBlobEmitterConfig.class);
41-
} catch (JsonProcessingException e) {
42-
throw new TikaConfigException(
43-
"Failed to parse AZBlobEmitterConfig from JSON", e);
44-
}
35+
return PluginJson.read(json, AZBlobEmitterConfig.class);
4536
}
4637

4738
public void validate() throws TikaConfigException {

‎tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/fetcher/azblob/config/AZBlobFetcherConfig.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,14 @@
1616
*/
1717
package org.apache.tika.pipes.fetcher.azblob.config;
1818

19-
import com.fasterxml.jackson.core.JsonProcessingException;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
21-
2219
import org.apache.tika.exception.TikaConfigException;
2320
import org.apache.tika.plugins.PluginJson;
2421

2522
public class AZBlobFetcherConfig {
2623

27-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
28-
2924
public static AZBlobFetcherConfig load(final String json)
3025
throws TikaConfigException {
31-
try {
32-
return OBJECT_MAPPER.readValue(json, AZBlobFetcherConfig.class);
33-
} catch (JsonProcessingException e) {
34-
throw new TikaConfigException(
35-
"Failed to parse AZBlobFetcherConfig from JSON", e);
36-
}
26+
return PluginJson.read(json, AZBlobFetcherConfig.class);
3727
}
3828

3929
private boolean spoolToTemp = true;

‎tika-pipes/tika-pipes-plugins/tika-pipes-az-blob/src/main/java/org/apache/tika/pipes/iterator/azblob/AZBlobPipesIteratorConfig.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,15 @@
1818

1919
import java.util.Objects;
2020

21-
import com.fasterxml.jackson.core.JsonProcessingException;
22-
import com.fasterxml.jackson.databind.ObjectMapper;
23-
2421
import org.apache.tika.exception.TikaConfigException;
2522
import org.apache.tika.pipes.pipesiterator.PipesIteratorConfig;
2623
import org.apache.tika.plugins.PluginJson;
2724

2825
public class AZBlobPipesIteratorConfig extends PipesIteratorConfig {
2926

30-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
31-
3227
public static AZBlobPipesIteratorConfig load(final String json)
3328
throws TikaConfigException {
34-
try {
35-
return OBJECT_MAPPER.readValue(json,
36-
AZBlobPipesIteratorConfig.class);
37-
} catch (JsonProcessingException e) {
38-
throw new TikaConfigException(
39-
"Failed to parse AZBlobPipesIteratorConfig from JSON", e);
40-
}
29+
return PluginJson.read(json, AZBlobPipesIteratorConfig.class);
4130
}
4231

4332
private String sasToken;

‎tika-pipes/tika-pipes-plugins/tika-pipes-csv/src/main/java/org/apache/tika/pipes/iterator/csv/CSVPipesIteratorConfig.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,15 @@
1919
import java.nio.file.Path;
2020
import java.util.Objects;
2121

22-
import com.fasterxml.jackson.core.JsonProcessingException;
23-
import com.fasterxml.jackson.databind.ObjectMapper;
24-
2522
import org.apache.tika.exception.TikaConfigException;
2623
import org.apache.tika.pipes.pipesiterator.PipesIteratorConfig;
2724
import org.apache.tika.plugins.PluginJson;
2825

2926
public class CSVPipesIteratorConfig extends PipesIteratorConfig {
3027

31-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
32-
3328
public static CSVPipesIteratorConfig load(final String json)
3429
throws TikaConfigException {
35-
try {
36-
return OBJECT_MAPPER.readValue(json,
37-
CSVPipesIteratorConfig.class);
38-
} catch (JsonProcessingException e) {
39-
throw new TikaConfigException(
40-
"Failed to parse CSVPipesIteratorConfig from JSON", e);
41-
}
30+
return PluginJson.read(json, CSVPipesIteratorConfig.class);
4231
}
4332

4433
private Path csvPath;

‎tika-pipes/tika-pipes-plugins/tika-pipes-es/src/main/java/org/apache/tika/pipes/emitter/es/ESEmitterConfig.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
*/
1717
package org.apache.tika.pipes.emitter.es;
1818

19-
import com.fasterxml.jackson.core.JsonProcessingException;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
21-
2219
import org.apache.tika.exception.TikaConfigException;
2320
import org.apache.tika.plugins.PluginJson;
2421

@@ -50,16 +47,9 @@ public enum UpdateStrategy {
5047
OVERWRITE, UPSERT
5148
}
5249

53-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
54-
5550
public static ESEmitterConfig load(final String json)
5651
throws TikaConfigException {
57-
try {
58-
return OBJECT_MAPPER.readValue(json, ESEmitterConfig.class);
59-
} catch (JsonProcessingException e) {
60-
throw new TikaConfigException(
61-
"Failed to parse ESEmitterConfig from JSON", e);
62-
}
52+
return PluginJson.read(json, ESEmitterConfig.class);
6353
}
6454

6555
/** Overrides the record default to prevent {@code apiKey} leaking into logs. */

‎tika-pipes/tika-pipes-plugins/tika-pipes-es/src/main/java/org/apache/tika/pipes/reporter/es/ESReporterConfig.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
import java.util.Set;
2020

21-
import com.fasterxml.jackson.core.JsonProcessingException;
22-
import com.fasterxml.jackson.databind.ObjectMapper;
23-
2421
import org.apache.tika.exception.TikaConfigException;
2522
import org.apache.tika.metadata.ReservedNamespaces;
2623
import org.apache.tika.pipes.emitter.es.HttpClientConfig;
@@ -31,16 +28,8 @@ public record ESReporterConfig(String esUrl, Set<String> includes, Set<String> e
3128
String keyPrefix, boolean includeRouting,
3229
String apiKey, HttpClientConfig httpClientConfig) {
3330

34-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
35-
3631
public static ESReporterConfig load(final String json) throws TikaConfigException {
37-
ESReporterConfig config;
38-
try {
39-
config = OBJECT_MAPPER.readValue(json, ESReporterConfig.class);
40-
} catch (JsonProcessingException e) {
41-
throw new TikaConfigException(
42-
"Failed to parse ESReporterConfig from JSON", e);
43-
}
32+
ESReporterConfig config = PluginJson.read(json, ESReporterConfig.class);
4433
// keyPrefix is prepended to this reporter's own scratch-Metadata keys (parse_status/
4534
// parse_time_ms/exit_value); reject a reserved prefix here, before it fails every report() call.
4635
if (!StringUtils.isBlank(config.keyPrefix()) && ReservedNamespaces.isTikaNative(config.keyPrefix())) {

‎tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterConfig.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
*/
1717
package org.apache.tika.pipes.emitter.fs;
1818

19-
import com.fasterxml.jackson.core.JsonProcessingException;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
21-
2219
import org.apache.tika.exception.TikaConfigException;
2320
import org.apache.tika.plugins.PluginJson;
2421

@@ -35,17 +32,9 @@ enum ON_EXISTS {
3532
}
3633
}
3734

38-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
39-
4035
public static FileSystemEmitterConfig load(final String json)
4136
throws TikaConfigException {
42-
try {
43-
return OBJECT_MAPPER.readValue(json,
44-
FileSystemEmitterConfig.class);
45-
} catch (JsonProcessingException e) {
46-
throw new TikaConfigException(
47-
"Failed to parse FileSystemEmitterConfig from JSON", e);
48-
}
37+
return PluginJson.read(json, FileSystemEmitterConfig.class);
4938
}
5039

5140
}

‎tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/emitter/fs/FileSystemEmitterRuntimeConfig.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
*/
1717
package org.apache.tika.pipes.emitter.fs;
1818

19-
import com.fasterxml.jackson.core.JsonProcessingException;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
21-
2219
import org.apache.tika.exception.TikaConfigException;
2320
import org.apache.tika.plugins.PluginJson;
2421

@@ -29,17 +26,9 @@
2926
*/
3027
public class FileSystemEmitterRuntimeConfig {
3128

32-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
33-
3429
public static FileSystemEmitterRuntimeConfig load(final String json)
3530
throws TikaConfigException {
36-
try {
37-
return OBJECT_MAPPER.readValue(json,
38-
FileSystemEmitterRuntimeConfig.class);
39-
} catch (JsonProcessingException e) {
40-
throw new TikaConfigException(
41-
"Failed to parse FileSystemEmitterRuntimeConfig from JSON", e);
42-
}
31+
return PluginJson.read(json, FileSystemEmitterRuntimeConfig.class);
4332
}
4433

4534
private String fileExtension;

‎tika-pipes/tika-pipes-plugins/tika-pipes-file-system/src/main/java/org/apache/tika/pipes/fetcher/fs/FileSystemFetcherConfig.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,14 @@
1616
*/
1717
package org.apache.tika.pipes.fetcher.fs;
1818

19-
import com.fasterxml.jackson.core.JsonProcessingException;
20-
import com.fasterxml.jackson.databind.ObjectMapper;
21-
2219
import org.apache.tika.exception.TikaConfigException;
2320
import org.apache.tika.plugins.PluginJson;
2421

2522
public class FileSystemFetcherConfig {
2623

27-
private static final ObjectMapper OBJECT_MAPPER = PluginJson.mapper();
28-
2924
public static FileSystemFetcherConfig load(final String json)
3025
throws TikaConfigException {
31-
try {
32-
return OBJECT_MAPPER.readValue(json,
33-
FileSystemFetcherConfig.class);
34-
} catch (JsonProcessingException e) {
35-
throw new TikaConfigException(
36-
"Failed to parse FileSystemFetcherConfig from JSON", e);
37-
}
26+
return PluginJson.read(json, FileSystemFetcherConfig.class);
3827
}
3928

4029
private String basePath;

0 commit comments

Comments
 (0)