CAMEL-8269: Fixed mapping issues for API 33.0, fixes CAMEL-8737, and mapping of picklist validFor property and SObjectDescription actionOverrides
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d07d7f00 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d07d7f00 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d07d7f00 Branch: refs/heads/camel-2.15.x Commit: d07d7f002f2d0e03a0add97d69b518c2268df5b0 Parents: c0896f8 Author: Dhiraj Bokde <[email protected]> Authored: Mon May 4 12:58:58 2015 -0700 Committer: Dhiraj Bokde <[email protected]> Committed: Mon May 4 13:06:43 2015 -0700 ---------------------------------------------------------------------- .../salesforce/api/dto/ActionOverride.java | 58 +++++++------------- .../api/dto/ActionOverrideTypeEnum.java | 57 ------------------- .../salesforce/api/dto/FilteredLookupInfo.java | 8 ++- .../salesforce/api/dto/PickListValue.java | 6 +- 4 files changed, 28 insertions(+), 101 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d07d7f00/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ActionOverride.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ActionOverride.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ActionOverride.java index eff26df..40feed4 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ActionOverride.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ActionOverride.java @@ -16,60 +16,42 @@ */ package org.apache.camel.component.salesforce.api.dto; -import com.thoughtworks.xstream.annotations.XStreamConverter; - -import org.apache.camel.component.salesforce.api.PicklistEnumConverter; - public class ActionOverride extends AbstractDTOBase { - private String actionName; - - private String comment; - - private String content; - - private Boolean skipRecordTypeSelect; - - @XStreamConverter(PicklistEnumConverter.class) - private ActionOverrideTypeEnum type; - - public String getActionName() { - return actionName; - } - - public void setActionName(String actionName) { - this.actionName = actionName; - } + private String name; + private String pageId; + private String url; + private Boolean isAvailableInTouch; - public String getComment() { - return comment; + public String getName() { + return name; } - public void setComment(String comment) { - this.comment = comment; + public void setName(String name) { + this.name = name; } - public String getContent() { - return content; + public String getPageId() { + return pageId; } - public void setContent(String content) { - this.content = content; + public void setPageId(String pageId) { + this.pageId = pageId; } - public Boolean getSkipRecordTypeSelect() { - return skipRecordTypeSelect; + public String getUrl() { + return url; } - public void setSkipRecordTypeSelect(Boolean skipRecordTypeSelect) { - this.skipRecordTypeSelect = skipRecordTypeSelect; + public void setUrl(String url) { + this.url = url; } - public ActionOverrideTypeEnum getType() { - return type; + public Boolean getIsAvailableInTouch() { + return isAvailableInTouch; } - public void setType(ActionOverrideTypeEnum type) { - this.type = type; + public void setIsAvailableInTouch(Boolean isAvailableInTouch) { + this.isAvailableInTouch = isAvailableInTouch; } } http://git-wip-us.apache.org/repos/asf/camel/blob/d07d7f00/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ActionOverrideTypeEnum.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ActionOverrideTypeEnum.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ActionOverrideTypeEnum.java deleted file mode 100644 index 967b0a8..0000000 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/ActionOverrideTypeEnum.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.salesforce.api.dto; - -import org.codehaus.jackson.annotate.JsonCreator; -import org.codehaus.jackson.annotate.JsonValue; -import org.codehaus.jackson.map.annotate.JsonDeserialize; - -@JsonDeserialize -public enum ActionOverrideTypeEnum { - - // The override uses a custom override provided by an installed package. - // If there isnât one available, the standard Salesforce behavior is used. - DEFAULT("default"), - // The override uses behavior from an s-control. - SCONTROL("scontrol"), - // The override uses regular Salesforce behavior. - STANDARD("standard"), - // The override uses behavior from a Visualforce page. - VISUALFORCE("visualforce"); - - final String value; - - private ActionOverrideTypeEnum(String value) { - this.value = value; - } - - @JsonValue - public String value() { - return this.value; - } - - @JsonCreator - public static ActionOverrideTypeEnum fromValue(String value) { - for (ActionOverrideTypeEnum e : ActionOverrideTypeEnum.values()) { - if (e.value.equals(value)) { - return e; - } - } - throw new IllegalArgumentException(value); - } - -} http://git-wip-us.apache.org/repos/asf/camel/blob/d07d7f00/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/FilteredLookupInfo.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/FilteredLookupInfo.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/FilteredLookupInfo.java index 182efd6..3bbaac1 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/FilteredLookupInfo.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/FilteredLookupInfo.java @@ -16,17 +16,19 @@ */ package org.apache.camel.component.salesforce.api.dto; +import java.util.List; + public class FilteredLookupInfo extends AbstractDTOBase { - private String controllingFields; + private List<String> controllingFields; private Boolean dependent; private Boolean optionalFilter; - public String getControllingFields() { + public List<String> getControllingFields() { return controllingFields; } - public void setControllingFields(String controllingFields) { + public void setControllingFields(List<String> controllingFields) { this.controllingFields = controllingFields; } http://git-wip-us.apache.org/repos/asf/camel/blob/d07d7f00/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/PickListValue.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/PickListValue.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/PickListValue.java index 7816848..2ae2cfd 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/PickListValue.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/PickListValue.java @@ -25,7 +25,7 @@ public class PickListValue { private String label; private Boolean active; private Boolean defaultValue; - private String validFor; + private byte[] validFor; public String getValue() { return value; @@ -59,11 +59,11 @@ public class PickListValue { this.defaultValue = defaultValue; } - public String getValidFor() { + public byte[] getValidFor() { return validFor; } - public void setValidFor(String validFor) { + public void setValidFor(byte[] validFor) { this.validFor = validFor; }
