Skip to content
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

Jump to bottom

LPS-64349 autoSF #38449

Closed
wants to merge 4 commits into from
Closed

LPS-64349 autoSF #38449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6b9470
LPS-64349 build.gradle - adds portal.kernel build dependency
drewbrokke Mar 30, 2016
056300a
LPS-64349 won't add a filter definition if filter string is empty
drewbrokke Mar 30, 2016
c4009a9
LPS-64349 Better use Validator
Mar 31, 2016
b2a7c5b
LPS-64349 autoSF
drewbrokke Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/apps/foundation/portal-remote/portal-remote-rest-extender/build.gradle
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ dependencies {
provided group: "com.liferay", name: "com.liferay.portal.configuration.metatype", version: "2.0.0"
provided group: "com.liferay", name: "com.liferay.portal.remote.cxf.jaxrs.common", version: "2.0.0"
provided group: "com.liferay", name: "com.liferay.portal.remote.dependency.manager.tccl", version: "2.0.0"
provided group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "2.0.0"
provided group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.0.1"
provided group: "org.apache.cxf", name: "cxf-core", version: "3.0.3"
provided group: "org.apache.cxf", name: "cxf-rt-frontend-jaxrs", version: "3.0.3"
Expand Down
37 changes: 23 additions & 14 deletions ...extender/src/main/java/com/liferay/portal/remote/rest/extender/internal/RestExtender.java
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@
package com.liferay.portal.remote.rest.extender.internal;

import com.liferay.portal.configuration.metatype.bnd.util.ConfigurableUtil;
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.remote.dependency.manager.tccl.TCCLDependencyManager;
import com.liferay.portal.remote.rest.extender.configuration.RestExtenderConfiguration;

Expand Down Expand Up @@ -83,11 +84,13 @@ protected void addBusDependencies() {
}

for (String contextPath : contextPaths) {
addTCCLServiceDependency(
true, Bus.class,
"(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH +
"=" + contextPath + ")",
"addBus", "removeBus");
if (Validator.isNotNull(contextPath)) {
addTCCLServiceDependency(
true, Bus.class,
"(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH +
"=" + contextPath + ")",
"addBus", "removeBus");
}
}
}

Expand All @@ -105,9 +108,11 @@ protected void addJaxRsApplicationDependencies() {
for (String jaxRsApplicationFilterString :
jaxRsApplicationFilterStrings) {

addTCCLServiceDependency(
false, Application.class, jaxRsApplicationFilterString,
"addApplication", "removeApplication");
if (Validator.isNotNull(jaxRsApplicationFilterString)) {
addTCCLServiceDependency(
false, Application.class, jaxRsApplicationFilterString,
"addApplication", "removeApplication");
}
}
}

Expand All @@ -123,9 +128,11 @@ protected void addJaxRsProviderServiceDependencies() {
}

for (String jaxRsProviderFilterString : jaxRsProviderFilterStrings) {
addTCCLServiceDependency(
false, null, jaxRsProviderFilterString, "addProvider",
"removeProvider");
if (Validator.isNotNull(jaxRsProviderFilterString)) {
addTCCLServiceDependency(
false, null, jaxRsProviderFilterString, "addProvider",
"removeProvider");
}
}
}

Expand All @@ -141,9 +148,11 @@ protected void addJaxRsServiceDependencies() {
}

for (String jaxRsServiceFilterString : jaxRsServiceFilterStrings) {
addTCCLServiceDependency(
false, null, jaxRsServiceFilterString, "addService",
"removeService");
if (Validator.isNotNull(jaxRsServiceFilterString)) {
addTCCLServiceDependency(
false, null, jaxRsServiceFilterString, "addService",
"removeService");
}
}
}

Expand Down