Skip to content

Commit 4f0d17d

Browse files
acoburnacoburn
authored
Normalize configuration
Resolves #606
1 parent 8d44e49 commit 4f0d17d

File tree

33 files changed

+117
-140
lines changed

33 files changed

+117
-140
lines changed

‎auth/basic/src/main/java/org/trellisldp/auth/basic/BasicAuthFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class BasicAuthFilter implements ContainerRequestFilter {
5050
public static final String CONFIG_AUTH_REALM = "trellis.auth.realm";
5151

5252
/** The configuration key controlling the list of of admin WebID values. */
53-
public static final String CONFIG_AUTH_ADMIN_USERS = "trellis.auth.adminusers";
53+
public static final String CONFIG_AUTH_ADMIN_USERS = "trellis.auth.admin-users";
5454

5555
/** The admin role. */
5656
public static final String ADMIN_ROLE = "admin";

‎auth/jwt/src/main/java/org/trellisldp/auth/jwt/JwtAuthFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class JwtAuthFilter implements ContainerRequestFilter {
3939
private static final Logger LOGGER = getLogger(JwtAuthFilter.class);
4040

4141
/** The configuration key controlling the list of of admin WebID values. */
42-
public static final String CONFIG_AUTH_ADMIN_USERS = "trellis.auth.adminusers";
42+
public static final String CONFIG_AUTH_ADMIN_USERS = "trellis.auth.admin-users";
4343

4444
private final Set<String> admins;
4545

‎auth/oauth/src/main/java/org/trellisldp/auth/oauth/OAuthFilter.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,22 @@
4848
@Priority(AUTHENTICATION)
4949
public class OAuthFilter implements ContainerRequestFilter {
5050

51+
/** The configuration key controlling the list of of admin WebID values. */
52+
public static final String CONFIG_AUTH_ADMIN_USERS = "trellis.auth.admin-users";
5153
/** The configuration key controlling the realm used in a WWW-Authenticate header, or 'trellis' by default. */
5254
public static final String CONFIG_AUTH_REALM = "trellis.auth.realm";
5355
/** The configuration key controlling the OAuth Keystore path. */
54-
public static final String CONFIG_AUTH_OAUTH_KEYSTORE_PATH = "trellis.auth.oauth.keystore.path";
56+
public static final String CONFIG_AUTH_OAUTH_KEYSTORE_PATH = "trellis.auth.oauth.keystore-path";
5557
/** The configuration key controlling the OAuth Keystore credentials. */
56-
public static final String CONFIG_AUTH_OAUTH_KEYSTORE_CREDENTIALS = "trellis.auth.oauth.keystore.credentials";
58+
public static final String CONFIG_AUTH_OAUTH_KEYSTORE_CREDENTIALS = "trellis.auth.oauth.keystore-credentials";
5759
/** The configuration key controlling the OAuth Keystore ids. */
58-
public static final String CONFIG_AUTH_OAUTH_KEYSTORE_IDS = "trellis.auth.oauth.keystore.ids";
60+
public static final String CONFIG_AUTH_OAUTH_KEYSTORE_IDS = "trellis.auth.oauth.keystore-ids";
5961
/** The configuration key controlling the OAuth HMAC shared secret. */
60-
public static final String CONFIG_AUTH_OAUTH_SHARED_SECRET = "trellis.auth.oauth.sharedsecret";
62+
public static final String CONFIG_AUTH_OAUTH_SHARED_SECRET = "trellis.auth.oauth.shared-secret";
6163
/** The configuration key controlling the OAuth JWK URL. */
6264
public static final String CONFIG_AUTH_OAUTH_JWK_URL = "trellis.auth.oauth.jwk";
6365
/** The authentication scheme used by this module. */
6466
public static final String SCHEME = "Bearer";
65-
/** The configuration key controlling the list of of admin WebID values. */
66-
public static final String CONFIG_AUTH_ADMIN_USERS = "trellis.auth.adminusers";
6767
/** The admin role. */
6868
public static final String ADMIN_ROLE = "admin";
6969

‎components/app/src/test/resources/META-INF/microprofile-config.properties

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
trellis.triplestore.ldp.type=true
2-
trellis.triplestore.rdf.location=resources
3-
trellis.file.memento.basepath=mementos
4-
trellis.file.binary.basepath=binary
5-
trellis.namespaces.path=namespaces.json
1+
trellis.triplestore.ldp-type=true
2+
trellis.triplestore.rdf-location=resources
3+
trellis.file.memento-path=mementos
4+
trellis.file.binary-path=binary

‎components/dropwizard/src/main/java/org/trellisldp/dropwizard/AbstractTrellisApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public abstract class AbstractTrellisApplication<T extends TrellisConfiguration>
5252
private static final Logger LOGGER = getLogger(AbstractTrellisApplication.class);
5353

5454
/** The configuration key controlling whether an application should initialize its own root resource. */
55-
public static final String CONFIG_DROPWIZARD_INITIALIZE_ROOT = "trellis.dropwizard.initialize.root";
55+
public static final String CONFIG_DROPWIZARD_INITIALIZE_ROOT = "trellis.dropwizard.initialize-root";
5656

5757
/**
5858
* Get the Trellis {@link ServiceBundler}. This object collects the various

‎components/dropwizard/src/test/resources/META-INF/microprofile-config.properties

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
trellis.triplestore.ldp.type=true
2-
trellis.triplestore.rdf.location=resources
3-
trellis.file.memento.basepath=mementos
4-
trellis.file.binary.basepath=binary
5-
trellis.namespaces.path=namespaces.json
1+
trellis.triplestore.ldp-type=true
2+
trellis.triplestore.rdf-location=resources
3+
trellis.file.memento-path=mementos
4+
trellis.file.binary-path=binary

‎components/file/src/main/java/org/trellisldp/file/FileBinaryService.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
public class FileBinaryService implements BinaryService {
4949

5050
/** The configuration key controlling the base filesystem path for the binary service. */
51-
public static final String CONFIG_FILE_BINARY_BASE_PATH = "trellis.file.binary.basepath";
51+
public static final String CONFIG_FILE_BINARY_PATH = "trellis.file.binary-path";
5252

5353
/** The configuration key controlling the levels of hierarchy in a binary storage layout. */
54-
public static final String CONFIG_FILE_BINARY_HIERARCHY = "trellis.file.binary.hierarchy";
54+
public static final String CONFIG_FILE_BINARY_HIERARCHY = "trellis.file.binary-hierarchy";
5555

5656
/** The configuration key controlling the length of each level of hierarchy in a filesystem layout. */
57-
public static final String CONFIG_FILE_BINARY_LENGTH = "trellis.file.binary.length";
57+
public static final String CONFIG_FILE_BINARY_LENGTH = "trellis.file.binary-length";
5858

5959
private static final Logger LOGGER = getLogger(FileBinaryService.class);
6060
private static final int DEFAULT_HIERARCHY = 3;
@@ -96,7 +96,7 @@ public FileBinaryService(final IdentifierService idService, final String basePat
9696
}
9797

9898
private FileBinaryService(final IdentifierService idService, final Config config) {
99-
this(idService, config.getValue(CONFIG_FILE_BINARY_BASE_PATH, String.class),
99+
this(idService, config.getValue(CONFIG_FILE_BINARY_PATH, String.class),
100100
config.getOptionalValue(CONFIG_FILE_BINARY_HIERARCHY, Integer.class).orElse(DEFAULT_HIERARCHY),
101101
config.getOptionalValue(CONFIG_FILE_BINARY_LENGTH, Integer.class).orElse(DEFAULT_LENGTH));
102102
}

‎components/file/src/main/java/org/trellisldp/file/FileMementoService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
public class FileMementoService implements MementoService {
4646

4747
/** The configuration key controlling the base filesystem path for memento storage. */
48-
public static final String CONFIG_FILE_MEMENTO_BASE_PATH = "trellis.file.memento.basepath";
48+
public static final String CONFIG_FILE_MEMENTO_PATH = "trellis.file.memento-path";
4949

5050
private static final Logger LOGGER = getLogger(FileMementoService.class);
5151

@@ -55,7 +55,7 @@ public class FileMementoService implements MementoService {
5555
* Create a file-based memento service.
5656
*/
5757
public FileMementoService() {
58-
this(ConfigProvider.getConfig().getValue(CONFIG_FILE_MEMENTO_BASE_PATH, String.class));
58+
this(ConfigProvider.getConfig().getValue(CONFIG_FILE_MEMENTO_PATH, String.class));
5959
}
6060

6161
/**

‎components/file/src/test/java/org/trellisldp/file/FileBinaryServiceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ class FileBinaryServiceTest {
5252

5353
@BeforeAll
5454
static void setUpEverything() {
55-
System.setProperty(FileBinaryService.CONFIG_FILE_BINARY_BASE_PATH, directory);
55+
System.setProperty(FileBinaryService.CONFIG_FILE_BINARY_PATH, directory);
5656
}
5757

5858
@AfterAll
5959
static void cleanUp() {
60-
System.clearProperty(FileBinaryService.CONFIG_FILE_BINARY_BASE_PATH);
60+
System.clearProperty(FileBinaryService.CONFIG_FILE_BINARY_PATH);
6161
}
6262

6363
@Test

‎components/file/src/test/java/org/trellisldp/file/FileMementoServiceTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void testList() {
107107
assertTrue(dir.isDirectory(), "Resource directory isn't a valid directory");
108108

109109
try {
110-
System.setProperty(FileMementoService.CONFIG_FILE_MEMENTO_BASE_PATH, dir.getAbsolutePath());
110+
System.setProperty(FileMementoService.CONFIG_FILE_MEMENTO_PATH, dir.getAbsolutePath());
111111

112112
final MementoService svc = new FileMementoService();
113113

@@ -125,7 +125,7 @@ void testList() {
125125
svc.get(identifier, MAX).thenAccept(res -> assertEquals(time2, res.getModified(), "Incorrect date!"))
126126
.toCompletableFuture().join();
127127
} finally {
128-
System.clearProperty(FileMementoService.CONFIG_FILE_MEMENTO_BASE_PATH);
128+
System.clearProperty(FileMementoService.CONFIG_FILE_MEMENTO_PATH);
129129
}
130130
}
131131

@@ -218,7 +218,7 @@ void testListNonExistent() {
218218
final File dir = new File(getClass().getResource("/versions").getFile());
219219

220220
try {
221-
System.setProperty(FileMementoService.CONFIG_FILE_MEMENTO_BASE_PATH, dir.getAbsolutePath());
221+
System.setProperty(FileMementoService.CONFIG_FILE_MEMENTO_PATH, dir.getAbsolutePath());
222222

223223
final MementoService svc = new FileMementoService();
224224
final IRI identifier = rdf.createIRI(TRELLIS_DATA_PREFIX + "nonexistent");
@@ -230,7 +230,7 @@ void testListNonExistent() {
230230
assertEquals(MISSING_RESOURCE, svc.get(identifier, now()).toCompletableFuture().join(),
231231
"Wrong response for missing resource!");
232232
} finally {
233-
System.clearProperty(FileMementoService.CONFIG_FILE_MEMENTO_BASE_PATH);
233+
System.clearProperty(FileMementoService.CONFIG_FILE_MEMENTO_PATH);
234234
}
235235
}
236236

@@ -239,7 +239,7 @@ void testListNone() {
239239
final File dir = new File(getClass().getResource("/versions").getFile());
240240

241241
try {
242-
System.setProperty(FileMementoService.CONFIG_FILE_MEMENTO_BASE_PATH, dir.getAbsolutePath());
242+
System.setProperty(FileMementoService.CONFIG_FILE_MEMENTO_PATH, dir.getAbsolutePath());
243243

244244
final MementoService svc = new FileMementoService();
245245
final IRI identifier = rdf.createIRI(TRELLIS_DATA_PREFIX + "empty");
@@ -251,7 +251,7 @@ void testListNone() {
251251
assertTrue(svc.mementos(identifier).toCompletableFuture().join().isEmpty(),
252252
"Memento list isn't empty!");
253253
} finally {
254-
System.clearProperty(FileMementoService.CONFIG_FILE_MEMENTO_BASE_PATH);
254+
System.clearProperty(FileMementoService.CONFIG_FILE_MEMENTO_PATH);
255255
}
256256
}
257257

@@ -265,7 +265,7 @@ void testNewVersionSystem() {
265265
assertFalse(versionDir.exists(), "Version directory already exists!");
266266

267267
try {
268-
System.setProperty(FileMementoService.CONFIG_FILE_MEMENTO_BASE_PATH, versionDir.getAbsolutePath());
268+
System.setProperty(FileMementoService.CONFIG_FILE_MEMENTO_PATH, versionDir.getAbsolutePath());
269269

270270
final FileMementoService svc = new FileMementoService();
271271

@@ -282,7 +282,7 @@ void testNewVersionSystem() {
282282
assertEquals(2L, svc.mementos(identifier).toCompletableFuture().join().size(),
283283
"Incorrect count of Mementos!");
284284
} finally {
285-
System.clearProperty(FileMementoService.CONFIG_FILE_MEMENTO_BASE_PATH);
285+
System.clearProperty(FileMementoService.CONFIG_FILE_MEMENTO_PATH);
286286
}
287287
}
288288
}

‎components/file/src/test/resources/META-INF/microprofile-config.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
trellis.file.memento.basepath=mementos
2-
trellis.file.binary.basepath=binaries
1+
trellis.file.memento-path=mementos
2+
trellis.file.binary-path=binaries

‎components/io-jena/src/main/java/org/trellisldp/io/JenaIOService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@
9797
public class JenaIOService implements IOService {
9898

9999
/** The configuration key listing valid JSON-LD profile documents. */
100-
public static final String CONFIG_IO_JSONLD_PROFILES = "trellis.io.jsonld.profiles";
100+
public static final String CONFIG_IO_JSONLD_PROFILES = "trellis.io.jsonld-profiles";
101101

102102
/** The configuration key listing valid JSON-LD profile domains. */
103-
public static final String CONFIG_IO_JSONLD_DOMAINS = "trellis.io.jsonld.domains";
103+
public static final String CONFIG_IO_JSONLD_DOMAINS = "trellis.io.jsonld-domains";
104104

105105
private static final Logger LOGGER = getLogger(JenaIOService.class);
106106
private static final JenaRDF rdf = new JenaRDF();

‎components/namespaces/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ dependencies {
2323
}
2424

2525
test {
26-
systemProperty 'trellis.namespace.prefixes', 'dc11=http://purl.org/dc/elements/1.1/,,foo= , =bar,baz, = '
26+
systemProperty 'trellis.namespaces.mapping', 'dc11=http://purl.org/dc/elements/1.1/,,foo= , =bar,baz, = '
2727
}

‎components/namespaces/src/main/java/org/trellisldp/namespaces/SimpleNamespaceService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
@ApplicationScoped
4646
public class SimpleNamespaceService implements NamespaceService {
4747

48-
public static final String CONFIG_NAMESPACE_PREFIXES = "trellis.namespace.prefixes";
48+
public static final String CONFIG_NAMESPACES_MAPPING = "trellis.namespaces.mapping";
4949

5050
private final Map<String, String> namespaces = new HashMap<>();
5151

@@ -63,7 +63,7 @@ public SimpleNamespaceService() {
6363
namespaces.put("xsd", XSD.getNamespace());
6464
namespaces.put("foaf", FOAF.getNamespace());
6565
namespaces.put("vcard", VCARD.getNamespace());
66-
getConfig().getOptionalValue(CONFIG_NAMESPACE_PREFIXES, String.class).map(SimpleNamespaceService::configToMap)
66+
getConfig().getOptionalValue(CONFIG_NAMESPACES_MAPPING, String.class).map(SimpleNamespaceService::configToMap)
6767
.ifPresent(data -> data.forEach(namespaces::put));
6868
}
6969

‎components/triplestore/src/main/java/org/trellisldp/triplestore/TriplestoreResourceService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
public class TriplestoreResourceService implements ResourceService {
9696

9797
/** The configuration key used to set where the RDF is stored. */
98-
public static final String CONFIG_TRIPLESTORE_RDF_LOCATION = "trellis.triplestore.rdf.location";
98+
public static final String CONFIG_TRIPLESTORE_RDF_LOCATION = "trellis.triplestore.rdf-location";
9999
/** The configuration key used to set whether the LDP type should be included in the body of the RDF. */
100-
public static final String CONFIG_TRIPLESTORE_LDP_TYPE = "trellis.triplestore.ldp.type";
100+
public static final String CONFIG_TRIPLESTORE_LDP_TYPE = "trellis.triplestore.ldp-type";
101101

102102
private static final String MODIFIED = "modified";
103103

‎components/webac/src/main/java/org/trellisldp/webac/WebAcFilter.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,21 @@ public class WebAcFilter implements ContainerRequestFilter, ContainerResponseFil
8181
* <p>Values defined here will be in addition to GET, HEAD and OPTIONS. Multiple methods should
8282
* be separated with commas.
8383
*/
84-
public static final String CONFIG_WEBAC_METHOD_READABLE = "trellis.webac.method.readable";
84+
public static final String CONFIG_WEBAC_READABLE_METHODS = "trellis.webac.readable-methods";
8585
/**
8686
* The configuration key controlling with HTTP methods should apply to the acl:Write.
8787
*
8888
* <p>Values defined here will be in addition to GET, HEAD and OPTIONS. Multiple methods should
8989
* be separated with commas.
9090
*/
91-
public static final String CONFIG_WEBAC_METHOD_WRITABLE = "trellis.webac.method.writable";
91+
public static final String CONFIG_WEBAC_WRITABLE_METHODS = "trellis.webac.writable-methods";
9292
/**
9393
* The configuration key controlling with HTTP methods should apply to the acl:Append.
9494
*
9595
* <p>Values defined here will be in addition to GET, HEAD and OPTIONS. Multiple methods should
9696
* be separated with commas.
9797
*/
98-
public static final String CONFIG_WEBAC_METHOD_APPENDABLE = "trellis.webac.method.appendable";
98+
public static final String CONFIG_WEBAC_APPENDABLE_METHODS = "trellis.webac.appendable-methods";
9999

100100
/** The configuration key controlling the realm used in a WWW-Authenticate header, or 'trellis' by default. */
101101
public static final String CONFIG_WEBAC_REALM = "trellis.webac.realm";
@@ -164,11 +164,11 @@ public WebAcFilter(final WebAcService accessService, final List<String> challeng
164164
.collect(toList());
165165
this.baseUrl = baseUrl;
166166
final Config config = getConfig();
167-
config.getOptionalValue(CONFIG_WEBAC_METHOD_READABLE, String.class).ifPresent(r ->
167+
config.getOptionalValue(CONFIG_WEBAC_READABLE_METHODS, String.class).ifPresent(r ->
168168
stream(r.split(",")).map(String::trim).map(String::toUpperCase).forEach(readable::add));
169-
config.getOptionalValue(CONFIG_WEBAC_METHOD_WRITABLE, String.class).ifPresent(w ->
169+
config.getOptionalValue(CONFIG_WEBAC_WRITABLE_METHODS, String.class).ifPresent(w ->
170170
stream(w.split(",")).map(String::trim).map(String::toUpperCase).forEach(writable::add));
171-
config.getOptionalValue(CONFIG_WEBAC_METHOD_APPENDABLE, String.class).ifPresent(a ->
171+
config.getOptionalValue(CONFIG_WEBAC_APPENDABLE_METHODS, String.class).ifPresent(a ->
172172
stream(a.split(",")).map(String::trim).map(String::toUpperCase).forEach(appendable::add));
173173
}
174174

‎components/webac/src/main/java/org/trellisldp/webac/WebAcService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
public class WebAcService {
8484

8585
/** The configuration key controlling whether to check member resources at the AuthZ enforcement point. */
86-
public static final String CONFIG_WEBAC_MEMBERSHIP_CHECK = "trellis.webac.membership.check";
86+
public static final String CONFIG_WEBAC_MEMBERSHIP_CHECK = "trellis.webac.membership-check";
8787

8888
private static final Logger LOGGER = getLogger(WebAcService.class);
8989
private static final CompletionStage<Void> DONE = CompletableFuture.completedFuture(null);

‎components/webac/src/test/java/org/trellisldp/webac/WebAcFilterTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ class WebAcFilterTest {
8787

8888
@BeforeAll
8989
static void setUpProperties() {
90-
System.setProperty(WebAcFilter.CONFIG_WEBAC_METHOD_READABLE, "READ");
91-
System.setProperty(WebAcFilter.CONFIG_WEBAC_METHOD_WRITABLE, "WRITE");
92-
System.setProperty(WebAcFilter.CONFIG_WEBAC_METHOD_APPENDABLE, "APPEND");
90+
System.setProperty(WebAcFilter.CONFIG_WEBAC_READABLE_METHODS, "READ");
91+
System.setProperty(WebAcFilter.CONFIG_WEBAC_WRITABLE_METHODS, "WRITE");
92+
System.setProperty(WebAcFilter.CONFIG_WEBAC_APPENDABLE_METHODS, "APPEND");
9393
}
9494

9595
@AfterAll
9696
static void cleanUpProperties() {
97-
System.clearProperty(WebAcFilter.CONFIG_WEBAC_METHOD_READABLE);
98-
System.clearProperty(WebAcFilter.CONFIG_WEBAC_METHOD_WRITABLE);
99-
System.clearProperty(WebAcFilter.CONFIG_WEBAC_METHOD_APPENDABLE);
97+
System.clearProperty(WebAcFilter.CONFIG_WEBAC_READABLE_METHODS);
98+
System.clearProperty(WebAcFilter.CONFIG_WEBAC_WRITABLE_METHODS);
99+
System.clearProperty(WebAcFilter.CONFIG_WEBAC_APPENDABLE_METHODS);
100100
}
101101

102102
@BeforeEach

‎components/webac/src/test/resources/META-INF/microprofile-config.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
trellis.webac.membership.check=true
1+
trellis.webac.membership-check=true

‎core/http/src/main/java/org/trellisldp/http/CacheControlFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
public class CacheControlFilter implements ContainerResponseFilter {
3939

4040
/** The configuration key for setting a cache-control max-age header. */
41-
public static final String CONFIG_HTTP_CACHE_AGE = "trellis.http.cache.maxage";
41+
public static final String CONFIG_HTTP_CACHE_MAX_AGE = "trellis.http.cache-max-age";
4242
/** The configuration key for setting a cache-control must-revalidate header. */
43-
public static final String CONFIG_HTTP_CACHE_REVALIDATE = "trellis.http.cache.revalidate";
43+
public static final String CONFIG_HTTP_CACHE_REVALIDATE = "trellis.http.cache-revalidate";
4444
/** The configuration key for setting a cache-control no-cache header. */
45-
public static final String CONFIG_HTTP_CACHE_NOCACHE = "trellis.http.cache.nocache";
45+
public static final String CONFIG_HTTP_CACHE_NOCACHE = "trellis.http.cache-nocache";
4646

4747
private final int cacheAge;
4848
private final boolean revalidate;
@@ -57,7 +57,7 @@ public CacheControlFilter() {
5757
}
5858

5959
private CacheControlFilter(final Config config) {
60-
this(config.getOptionalValue(CONFIG_HTTP_CACHE_AGE, Integer.class).orElse(86400),
60+
this(config.getOptionalValue(CONFIG_HTTP_CACHE_MAX_AGE, Integer.class).orElse(86400),
6161
config.getOptionalValue(CONFIG_HTTP_CACHE_REVALIDATE, Boolean.class).orElse(Boolean.TRUE),
6262
config.getOptionalValue(CONFIG_HTTP_CACHE_NOCACHE, Boolean.class).orElse(Boolean.FALSE));
6363
}

‎core/http/src/main/java/org/trellisldp/http/WebSubHeaderFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class WebSubHeaderFilter implements ContainerResponseFilter {
3737

3838
/** The configuration key controlling the location of a web-sub-hub. */
39-
public static final String CONFIG_HTTP_WEB_SUB_HUB = "trellis.http.websubhub";
39+
public static final String CONFIG_HTTP_WEB_SUB_HUB = "trellis.http.web-sub-hub";
4040

4141
private final String hub;
4242

0 commit comments

Comments
 (0)