Skip to content

SITES-29602 - core-cif-components-core: remove usage of Guava #1033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2025
Merged

SITES-29602 - core-cif-components-core: remove usage of Guava #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 69 additions & 59 deletions ...es/core/src/main/java/com/adobe/cq/commerce/core/components/client/DeniedHttpHeaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,69 +9,79 @@

package com.adobe.cq.commerce.core.components.client;

import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;

import com.google.common.collect.ImmutableSet;

public interface DeniedHttpHeaders {
/**
* A list of HTTP headers that cannot be overridden when configuring a list of custom HTTP headers
*/
Set<String> DENYLIST = ImmutableSet.of(org.apache.http.HttpHeaders.ACCEPT,
org.apache.http.HttpHeaders.ACCEPT_CHARSET,
org.apache.http.HttpHeaders.ACCEPT_ENCODING,
org.apache.http.HttpHeaders.ACCEPT_LANGUAGE,
org.apache.http.HttpHeaders.ACCEPT_RANGES,
org.apache.http.HttpHeaders.AGE,
org.apache.http.HttpHeaders.ALLOW,
org.apache.http.HttpHeaders.AUTHORIZATION,
org.apache.http.HttpHeaders.CACHE_CONTROL,
org.apache.http.HttpHeaders.CONNECTION,
org.apache.http.HttpHeaders.CONTENT_ENCODING,
org.apache.http.HttpHeaders.CONTENT_LANGUAGE,
org.apache.http.HttpHeaders.CONTENT_LENGTH,
org.apache.http.HttpHeaders.CONTENT_LOCATION,
org.apache.http.HttpHeaders.CONTENT_MD5,
org.apache.http.HttpHeaders.CONTENT_RANGE,
org.apache.http.HttpHeaders.CONTENT_TYPE,
org.apache.http.HttpHeaders.DATE,
org.apache.http.HttpHeaders.DAV,
org.apache.http.HttpHeaders.DEPTH,
org.apache.http.HttpHeaders.DESTINATION,
org.apache.http.HttpHeaders.ETAG,
org.apache.http.HttpHeaders.EXPECT,
org.apache.http.HttpHeaders.EXPIRES,
org.apache.http.HttpHeaders.FROM,
org.apache.http.HttpHeaders.HOST,
org.apache.http.HttpHeaders.IF,
org.apache.http.HttpHeaders.IF_MATCH,
org.apache.http.HttpHeaders.IF_MODIFIED_SINCE,
org.apache.http.HttpHeaders.IF_NONE_MATCH,
org.apache.http.HttpHeaders.IF_RANGE,
org.apache.http.HttpHeaders.IF_UNMODIFIED_SINCE,
org.apache.http.HttpHeaders.LAST_MODIFIED,
org.apache.http.HttpHeaders.LOCATION,
org.apache.http.HttpHeaders.LOCK_TOKEN,
org.apache.http.HttpHeaders.MAX_FORWARDS,
org.apache.http.HttpHeaders.OVERWRITE,
org.apache.http.HttpHeaders.PRAGMA,
org.apache.http.HttpHeaders.PROXY_AUTHENTICATE,
org.apache.http.HttpHeaders.PROXY_AUTHORIZATION,
org.apache.http.HttpHeaders.RANGE,
org.apache.http.HttpHeaders.REFERER,
org.apache.http.HttpHeaders.RETRY_AFTER,
org.apache.http.HttpHeaders.SERVER,
org.apache.http.HttpHeaders.STATUS_URI,
org.apache.http.HttpHeaders.TE,
org.apache.http.HttpHeaders.TIMEOUT,
org.apache.http.HttpHeaders.TRAILER,
org.apache.http.HttpHeaders.TRANSFER_ENCODING,
org.apache.http.HttpHeaders.UPGRADE,
org.apache.http.HttpHeaders.USER_AGENT,
org.apache.http.HttpHeaders.VARY,
org.apache.http.HttpHeaders.VIA,
org.apache.http.HttpHeaders.WARNING,
org.apache.http.HttpHeaders.WWW_AUTHENTICATE,
"Store",
"Preview-Version");
Set<String> DENYLIST = DeniedHeadersProvider.getDeniedHeaderNames();
}

class DeniedHeadersProvider {
static Set<String> getDeniedHeaderNames() {
String[] headers = new String[] {
org.apache.http.HttpHeaders.ACCEPT,
org.apache.http.HttpHeaders.ACCEPT_CHARSET,
org.apache.http.HttpHeaders.ACCEPT_ENCODING,
org.apache.http.HttpHeaders.ACCEPT_LANGUAGE,
org.apache.http.HttpHeaders.ACCEPT_RANGES,
org.apache.http.HttpHeaders.AGE,
org.apache.http.HttpHeaders.ALLOW,
org.apache.http.HttpHeaders.AUTHORIZATION,
org.apache.http.HttpHeaders.CACHE_CONTROL,
org.apache.http.HttpHeaders.CONNECTION,
org.apache.http.HttpHeaders.CONTENT_ENCODING,
org.apache.http.HttpHeaders.CONTENT_LANGUAGE,
org.apache.http.HttpHeaders.CONTENT_LENGTH,
org.apache.http.HttpHeaders.CONTENT_LOCATION,
org.apache.http.HttpHeaders.CONTENT_MD5,
org.apache.http.HttpHeaders.CONTENT_RANGE,
org.apache.http.HttpHeaders.CONTENT_TYPE,
org.apache.http.HttpHeaders.DATE,
org.apache.http.HttpHeaders.DAV,
org.apache.http.HttpHeaders.DEPTH,
org.apache.http.HttpHeaders.DESTINATION,
org.apache.http.HttpHeaders.ETAG,
org.apache.http.HttpHeaders.EXPECT,
org.apache.http.HttpHeaders.EXPIRES,
org.apache.http.HttpHeaders.FROM,
org.apache.http.HttpHeaders.HOST,
org.apache.http.HttpHeaders.IF,
org.apache.http.HttpHeaders.IF_MATCH,
org.apache.http.HttpHeaders.IF_MODIFIED_SINCE,
org.apache.http.HttpHeaders.IF_NONE_MATCH,
org.apache.http.HttpHeaders.IF_RANGE,
org.apache.http.HttpHeaders.IF_UNMODIFIED_SINCE,
org.apache.http.HttpHeaders.LAST_MODIFIED,
org.apache.http.HttpHeaders.LOCATION,
org.apache.http.HttpHeaders.LOCK_TOKEN,
org.apache.http.HttpHeaders.MAX_FORWARDS,
org.apache.http.HttpHeaders.OVERWRITE,
org.apache.http.HttpHeaders.PRAGMA,
org.apache.http.HttpHeaders.PROXY_AUTHENTICATE,
org.apache.http.HttpHeaders.PROXY_AUTHORIZATION,
org.apache.http.HttpHeaders.RANGE,
org.apache.http.HttpHeaders.REFERER,
org.apache.http.HttpHeaders.RETRY_AFTER,
org.apache.http.HttpHeaders.SERVER,
org.apache.http.HttpHeaders.STATUS_URI,
org.apache.http.HttpHeaders.TE,
org.apache.http.HttpHeaders.TIMEOUT,
org.apache.http.HttpHeaders.TRAILER,
org.apache.http.HttpHeaders.TRANSFER_ENCODING,
org.apache.http.HttpHeaders.UPGRADE,
org.apache.http.HttpHeaders.USER_AGENT,
org.apache.http.HttpHeaders.VARY,
org.apache.http.HttpHeaders.VIA,
org.apache.http.HttpHeaders.WARNING,
org.apache.http.HttpHeaders.WWW_AUTHENTICATE,
"Store",
"Preview-Version"
};
return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(headers)));
}
}
4 changes: 2 additions & 2 deletions .../cq/commerce/core/components/internal/services/ComponentsConfigurationAdapterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
package com.adobe.cq.commerce.core.components.internal.services;

import java.util.Collections;
import java.util.Map;

import org.apache.sling.api.adapter.AdapterFactory;
Expand All @@ -31,7 +32,6 @@

import com.adobe.cq.commerce.core.components.services.ComponentsConfiguration;
import com.adobe.cq.wcm.launches.utils.LaunchUtils;
import com.google.common.collect.ImmutableMap;

@Component(
service = { AdapterFactory.class },
Expand All @@ -46,7 +46,7 @@ public class ComponentsConfigurationAdapterFactory implements AdapterFactory {
private static final String SUBSERVICE_NAME = "cif-components-configuration";
private static final Logger LOG = LoggerFactory.getLogger(ComponentsConfigurationAdapterFactory.class);

private static final Map<String, Object> authInfo = ImmutableMap.of(ResourceResolverFactory.SUBSERVICE, SUBSERVICE_NAME);
private static final Map<String, Object> authInfo = Collections.singletonMap(ResourceResolverFactory.SUBSERVICE, SUBSERVICE_NAME);

private static final String CONFIGURATION_NAME = "cloudconfigs/commerce";

Expand Down