You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2013/08/28 16:02:22 UTC
[34/41] delete aggregated-sources directory which was created by
accident
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/ReadResult.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
deleted file mode 100644
index 9d05b54..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
+++ /dev/null
@@ -1,87 +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.olingo.odata2.api.ep.callback;
-
-import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
-import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties;
-
-/**
- * A {@link ReadResult} represents an inlined navigation property which points to an entry or feed.
- * The {@link ReadResult} contains the {@link EntityProviderReadProperties} which were used for read,
- * the <code>navigationPropertyName</code>, the read/de-serialized inlined entity and information whether the inlined content
- * is a <code>feed</code> (multiplicity of <code>1..m</code>) or a single <code>entry</code> (multiplicity of <code>0..1</code> or <code>1..1</code>).
- * If inlined navigation property is <code>nullable</code> the {@link ReadResult} has the
- * <code>navigationPropertyName</code> and a <code>NULL</code> entry set.
- *
- *
- */
-public abstract class ReadResult {
-
- protected final EntityProviderReadProperties readProperties;
- protected final EdmNavigationProperty navigationProperty;
-
- /**
- * Constructor.
- * Parameters <b>MUST NOT BE NULL</b>.
- *
- * @param readProperties read properties which are used to read enclosing parent entity
- * @param navigationProperty emd navigation property information of found inline navigation property
- */
- public ReadResult(final EntityProviderReadProperties readProperties, final EdmNavigationProperty navigationProperty) {
- this.readProperties = readProperties;
- this.navigationProperty = navigationProperty;
- }
-
- /**
- * @return read properties which were used to read enclosing parent entity
- */
- public EntityProviderReadProperties getReadProperties() {
- return readProperties;
- }
-
- /**
- * @return emd navigation property information of found inline navigation property
- */
- public EdmNavigationProperty getNavigationProperty() {
- return navigationProperty;
- }
-
- /**
- * Common access method to read result.
- *
- * @return an {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}
- * for the case of an single read entry or a list of
- * {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry ODataEntry}
- * in the case of an read feed.
- */
- public abstract Object getResult();
-
- @Override
- public String toString() {
- return this.getClass().getSimpleName() + " [readProperties=" + readProperties + ", navigationProperty=" + navigationProperty + "]";
- }
-
- /**
- * Return whether this entry is a <code>feed</code> (multiplicity of <code>1..m</code>)
- * or a single <code>entry</code> (multiplicity of <code>0..1</code> or <code>1..1</code>).
- *
- * @return <code>true</code> for a feed and <code>false</code> for an entry
- */
- public abstract boolean isFeed();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
deleted file mode 100644
index 7c91690..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
+++ /dev/null
@@ -1,56 +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.olingo.odata2.api.ep.callback;
-
-import org.apache.olingo.odata2.api.ODataCallback;
-
-/**
- * <p>Interface that must be implemented in order to provide tombstone support.</p>
- * <p>The callback implementing this interface is registered at the
- * {@link org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties EntityProviderWriteProperties}
- * using the callback key of this class.</p>
- *
- */
-public interface TombstoneCallback extends ODataCallback {
-
- /**
- * The key to be used when registering the callback at the
- * {@link org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties EntityProviderWriteProperties}
- */
- public static final String CALLBACK_KEY_TOMBSTONE = "~tombstoneCallback";
- public static final String PREFIX_TOMBSTONE = "at";
- public static final String NAMESPACE_TOMBSTONE = "http://purl.org/atompub/tombstones/1.0";
-
- @Deprecated
- public static final String REL_DELTA = "delta";
-
- /**
- * <p>This method is called after all entries have been serialized.</p>
- * <p>The returned {@link TombstoneCallbackResult} must contain all deleted entries,
- * in the form of List{@literal <}Map{@literal <}property name, property value{@literal >}{@literal >},
- * which should be serialized.</p>
- * <p>A map representing a deleted entry
- * <ul><li><b>MUST</b> contain all properties which are part of the key for this entry.</li>
- * <li><b>MAY</b> contain the property which is mapped on SyndicationUpdated.
- * The provided value here will result in the value of the "when" attribute
- * of the deleted entry.</li></ul></p>
- * <p>The provided delta link will be serialized at the end of the feed document.</p>
- */
- TombstoneCallbackResult getTombstoneCallbackResult();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
deleted file mode 100644
index ad9f1af..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
+++ /dev/null
@@ -1,66 +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.olingo.odata2.api.ep.callback;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Objects of this class are a container for the result of the {@link TombstoneCallback}.
- *
- *
- */
-public class TombstoneCallbackResult {
-
- private List<Map<String, Object>> deletedEntriesData;
- private String deltaLink;
-
- /**
- * A map representing a deleted entry <b>MUST</b> contain all properties which are part of the key for this entry.
- * <br>A map representing a deleted entry <b>MAY</b> contain the property which is mapped on SyndicationUpdated. The provided value here will result in the value of the "when" attribute of the deleted entry.
- * @return deleted entries in the form of List{@literal <}Map{@literal <}property name, property value{@literal >}{@literal >}
- */
- public List<Map<String, Object>> getDeletedEntriesData() {
- return deletedEntriesData;
- }
-
- /**
- * Sets the data for all deleted entries
- * @param deletedEntriesData
- */
- public void setDeletedEntriesData(final List<Map<String, Object>> deletedEntriesData) {
- this.deletedEntriesData = deletedEntriesData;
- }
-
- /**
- * @return delta link as String
- */
- public String getDeltaLink() {
- return deltaLink;
- }
-
- /**
- * Sets the delta link to retrieve a delta.
- * @param deltaLink
- */
- public void setDeltaLink(final String deltaLink) {
- this.deltaLink = deltaLink;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
deleted file mode 100644
index d834447..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
+++ /dev/null
@@ -1,120 +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.olingo.odata2.api.ep.callback;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmException;
-import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
-import org.apache.olingo.odata2.api.ep.EntityProviderException;
-import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
-
-/**
- * Wrapper for {@link WriteEntryCallbackContext} and {@link WriteFeedCallbackContext}.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public abstract class WriteCallbackContext {
- private EdmEntitySet sourceEntitySet;
- private EdmNavigationProperty navigationProperty;
- private Map<String, Object> entryData;
- private ExpandSelectTreeNode currentNode;
-
- /**
- * Current means the node pointing to the target entity set
- * @return the current node of the expand select tree
- */
- public ExpandSelectTreeNode getCurrentExpandSelectTreeNode() {
- return currentNode;
- }
-
- /**
- * Do Not Call This Method!
- * @param currentNode
- */
- public void setCurrentExpandSelectTreeNode(final ExpandSelectTreeNode currentNode) {
- this.currentNode = currentNode;
- }
-
- /**
- * Returns entity set which contains an entry that should be expanded
- * @return source entity set
- */
- public EdmEntitySet getSourceEntitySet() {
- return sourceEntitySet;
- }
-
- /**
- * Do Not Call This Method!
- * @param entitySet
- */
- public void setSourceEntitySet(final EdmEntitySet entitySet) {
- sourceEntitySet = entitySet;
- }
-
- /**
- * Navigation property which is contained in the expand clause.
- * @return navigation property pointing to the entity which has to be expanded.
- */
- public EdmNavigationProperty getNavigationProperty() {
- return navigationProperty;
- }
-
- /**
- * Do Not Call This Method!
- * @param navigationProperty
- */
- public void setNavigationProperty(final EdmNavigationProperty navigationProperty) {
- this.navigationProperty = navigationProperty;
- }
-
- /**
- * Source entry data which was just serialized.
- * @return data of the source entry
- */
- public Map<String, Object> getEntryData() {
- return entryData;
- }
-
- /**
- * Do Not Call This Method!
- * @param entryData
- */
- public void setEntryData(final Map<String, Object> entryData) {
- this.entryData = entryData;
- }
-
- /**
- * @return the key of the current entry as a Map<String,Object>
- * @throws EntityProviderException in case of an {@link EdmException}
- */
- public Map<String, Object> extractKeyFromEntryData() throws EntityProviderException {
- HashMap<String, Object> key = new HashMap<String, Object>();
- try {
- for (String keyPropertyName : sourceEntitySet.getEntityType().getKeyPropertyNames()) {
- key.put(keyPropertyName, entryData.get(keyPropertyName));
- }
- } catch (EdmException e) {
- throw new EntityProviderException(EntityProviderException.EXCEPTION_OCCURRED.addContent(e.getClass().getSimpleName()), e);
- }
- return key;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
deleted file mode 100644
index 8b47630..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
+++ /dev/null
@@ -1,26 +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.olingo.odata2.api.ep.callback;
-
-/**
- * Context given if the target of an expand is an entry. It contains the source entity set, the navigation property pointing to the entry which has to be expanded, the current expand select tree node and the data of the source entry.
- *
- *
- */
-public class WriteEntryCallbackContext extends WriteCallbackContext {}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
deleted file mode 100644
index c632045..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
+++ /dev/null
@@ -1,62 +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.olingo.odata2.api.ep.callback;
-
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties;
-
-/**
- * Result of a callback. It contains the data of the entry which is to be expanded as well as the properties of this entry.
- *
- */
-public class WriteEntryCallbackResult {
-
- EntityProviderWriteProperties inlineProperties;
- Map<String, Object> oneEntryData;
-
- /**
- * @return the inline properties
- */
- public EntityProviderWriteProperties getInlineProperties() {
- return inlineProperties;
- }
-
- /**
- * Sets the inline properties for this entry
- * @param inlineProperties
- */
- public void setInlineProperties(final EntityProviderWriteProperties inlineProperties) {
- this.inlineProperties = inlineProperties;
- }
-
- /**
- * @return the data for the entry as a map
- */
- public Map<String, Object> getEntryData() {
- return oneEntryData;
- }
-
- /**
- * @param data for the entry as a map
- */
- public void setEntryData(final Map<String, Object> data) {
- oneEntryData = data;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
deleted file mode 100644
index f806bb6..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
+++ /dev/null
@@ -1,48 +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.olingo.odata2.api.ep.callback;
-
-import java.net.URI;
-
-/**
- * Context given if the target of an expand is a feed. It contains the source entity set, the navigation property pointing to the entry which has to be expanded, the current expand select tree node and the data of the source entry.
- *
- *
- */
-public class WriteFeedCallbackContext extends WriteCallbackContext {
-
- private URI selfLink;
-
- /**
- * Sets the self Link for this feed.
- * @param selfLink
- */
- public void setSelfLink(final URI selfLink) {
- this.selfLink = selfLink;
- }
-
- /**
- * This self link is the same as the link displayed for the navigation property e.g. Rooms(1)/nr_Buildings.
- * @return the self link calculated by the library
- */
- public URI getSelfLink() {
- return selfLink;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
deleted file mode 100644
index 6e37fc3..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
+++ /dev/null
@@ -1,66 +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.olingo.odata2.api.ep.callback;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties;
-
-/**
- * Result of a callback. It contains the data of the feed which is to be expanded as well as the BaseUri of the feed. Further callbacks for this feed can also be set.
- *
- *
- */
-public class WriteFeedCallbackResult {
-
- EntityProviderWriteProperties inlineProperties;
- List<Map<String, Object>> feedData;
-
- /**
- * @return the inline provider properties
- */
- public EntityProviderWriteProperties getInlineProperties() {
- return inlineProperties;
- }
-
- /**
- * Sets the properties for the inline data. MUST NOT BE NULL.
- * @param inlineProperties
- */
- public void setInlineProperties(final EntityProviderWriteProperties inlineProperties) {
- this.inlineProperties = inlineProperties;
- }
-
- /**
- * @return the feed data as a list of maps
- */
- public List<Map<String, Object>> getFeedData() {
- return feedData;
- }
-
- /**
- * Sets the feed data as a list of maps.
- * @param feedData
- */
- public void setFeedData(final List<Map<String, Object>> feedData) {
- this.feedData = feedData;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/package-info.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/package-info.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/package-info.java
deleted file mode 100644
index 6762b24..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/callback/package-info.java
+++ /dev/null
@@ -1,28 +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.
- ******************************************************************************/
-/**
- * Entity Provider Callbacks<p>
- * These callbacks will be used to support the $expand query option. Callbacks have to implement the {@link org.apache.olingo.odata2.api.ODataCallback} as a marker.
- * <br>To support an expanded entry the {@link org.apache.olingo.odata2.api.ep.callback.OnWriteEntryContent} interface has to be implemented.
- * <br>To support an expanded feed the {@link org.apache.olingo.odata2.api.ep.callback.OnWriteFeedContent} interface has to be implemented.
- *
- * <p>All callbacks are registered for a navigation property in a HashMap<String as navigation property name, callback for this navigation property> and will only be called if a matching $expand clause is found.
- */
-package org.apache.olingo.odata2.api.ep.callback;
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/EntryMetadata.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/EntryMetadata.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/EntryMetadata.java
deleted file mode 100644
index a253665..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/EntryMetadata.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.olingo.odata2.api.ep.entry;
-
-import java.util.List;
-
-/**
- * {@link EntryMetadata} contains all metadata for an {@link ODataEntry}.
- */
-public interface EntryMetadata {
-
- /**
- * Gets the URI of this entry.
- *
- * @return the URI
- */
- public abstract String getUri();
-
- /**
- * Gets the association URIs for a given navigation property.
- *
- * @param navigationPropertyName the name of the navigation property
- * @return the list of URIs for the given navigation property
- */
- public abstract List<String> getAssociationUris(String navigationPropertyName);
-
- /**
- * Gets the entity tag for this entry.
- *
- * @return the entity tag
- */
- public abstract String getEtag();
-
- /**
- * Gets the ID of this entry.
- *
- * @return the ID
- */
- public abstract String getId();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/MediaMetadata.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/MediaMetadata.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/MediaMetadata.java
deleted file mode 100644
index 28b5f19..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/MediaMetadata.java
+++ /dev/null
@@ -1,54 +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.olingo.odata2.api.ep.entry;
-
-/**
- * {@link MediaMetadata} contains all metadata for media related entries.
- */
-public interface MediaMetadata {
-
- /**
- * Get <code>edit link</code>.
- *
- * @return <code>edit link</code>.
- */
- public abstract String getEditLink();
-
- /**
- * Get <code>content type</code> in as specified in
- * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html">RFC 2616 Section 14</a>.
- *
- * @return <code>content type</code>.
- */
- public abstract String getContentType();
-
- /**
- * Get <code>etag</code>.
- *
- * @return <code>etag</code>.
- */
- public abstract String getEtag();
-
- /**
- * Get <code>source link</code>.
- *
- * @return <code>source link</code>.
- */
- public abstract String getSourceLink();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/ODataEntry.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/ODataEntry.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/ODataEntry.java
deleted file mode 100644
index ef2d307..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/ODataEntry.java
+++ /dev/null
@@ -1,69 +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.olingo.odata2.api.ep.entry;
-
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
-
-/**
- * An {@link ODataEntry} contains all <b>properties</b> (in form of a {@link Map}) and possible <b>metadata</b>
- * (in form of {@link MediaMetadata} and/or {@link EntryMetadata}) for an entry.
- *
- */
-public interface ODataEntry {
-
- /**
- * Properties of this {@link ODataEntry} in form of a <b>property name</b> to <b>property value</b> map.
- *
- * @return a <b>property name</b> to <b>property value</b> map.
- */
- public Map<String, Object> getProperties();
-
- /**
- * Get {@link MediaMetadata} for this {@link ODataEntry} if available.
- *
- * @return {@link MediaMetadata} for this {@link ODataEntry} if available.
- */
- public MediaMetadata getMediaMetadata();
-
- /**
- * Get {@link EntryMetadata} for this {@link ODataEntry} if available.
- *
- * @return {@link EntryMetadata} for this {@link ODataEntry} if available.
- */
- public EntryMetadata getMetadata();
-
- /**
- * If this {@link ODataEntry} contains properties of an inline navigation property this method
- * returns <code>true</code>.
- * Otherwise if this {@link ODataEntry} only contains it own properties this method
- * returns <code>false</code>.
- *
- * @return <code>true</code> if inline navigation properties are contained, otherwise <code>false</code>.
- */
- public boolean containsInlineEntry();
-
- /**
- * Gets the expand select tree data structure which can be used for <code>$expand</code> query option.
- *
- * @return parsed tree structure representing the $expand
- */
- public ExpandSelectTreeNode getExpandSelectTree();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/package-info.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/package-info.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/package-info.java
deleted file mode 100644
index f2be764..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/entry/package-info.java
+++ /dev/null
@@ -1,26 +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.
- ******************************************************************************/
-/**
- * Entity Provider Entries<p>
- *
- * The <b>org.apache.olingo.odata2.api.ep.entry</b> package contains all classes related and necessary for an {@link org.apache.olingo.odata2.api.ep.entry.ODataEntry}.
- * <p>
- */
-package org.apache.olingo.odata2.api.ep.entry;
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
deleted file mode 100644
index f17a8df..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
+++ /dev/null
@@ -1,43 +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.olingo.odata2.api.ep.feed;
-
-/**
- * {@link FeedMetadata} objects contain metadata information about one feed.
- *
- *
- */
-public interface FeedMetadata {
-
- /**
- * @return inlineCount may be null if no inlineCount is set.
- */
- public Integer getInlineCount();
-
- /**
- * @return nextLink may be null if no next link is set
- */
- public String getNextLink();
-
- /**
- * @return deltaLink may be null if no delta link is set
- */
- public String getDeltaLink();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
deleted file mode 100644
index c6ebd4b..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
+++ /dev/null
@@ -1,43 +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.olingo.odata2.api.ep.feed;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
-
-/**
- * An {@link ODataFeed} object contains a list of {@link ODataEntry}s and the metadata associated with this feed.
- *
- *
- */
-public interface ODataFeed {
-
- /**
- * The returned list may be empty but never null.
- * @return list of {@link ODataEntry}s
- */
- public List<ODataEntry> getEntries();
-
- /**
- * @return {@link FeedMetadata} object
- */
- public FeedMetadata getFeedMetadata();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/package-info.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/package-info.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/package-info.java
deleted file mode 100644
index 574e5be..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/feed/package-info.java
+++ /dev/null
@@ -1,26 +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.
- ******************************************************************************/
-/**
- * Entity Provider Feed<p>
- *
- * The <b>org.apache.olingo.odata2.api.ep.feed</b> package contains all classes related and necessary for an {@link org.apache.olingo.odata2.api.ep.feed.ODataFeed}.
- * <p>
- */
-package org.apache.olingo.odata2.api.ep.feed;
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/package-info.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/package-info.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/package-info.java
deleted file mode 100644
index 8d61f84..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/ep/package-info.java
+++ /dev/null
@@ -1,34 +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.
- ******************************************************************************/
-/**
- * Entity Provider<p>
- *
- * The <b>org.apache.olingo.odata2.api.ep</b> package contains all classes related and necessary to provide an {@link org.apache.olingo.odata2.api.ep.EntityProvider}.
- * <p>
- * An {@link org.apache.olingo.odata2.api.ep.EntityProvider} provides all necessary <b>read</b> and <b>write</b> methods for accessing
- * the entities defined in an <code>Entity Data Model</code>.
- * Therefore this library provides (in its <code>core</code> packages) as convenience basic {@link org.apache.olingo.odata2.api.ep.EntityProvider}
- * for accessing entities in the <b>XML</b> and <b>JSON</b> format.
- * <p>
- * For support of additional formats it is recommended to handle those directly within an implementation of a
- * <code>ODataProcessor</code> (it is possible but <b>not recommended</b> to implement an own
- * {@link org.apache.olingo.odata2.api.ep.EntityProvider} for support of additional formats).
- */
-package org.apache.olingo.odata2.api.ep;
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/MessageReference.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/MessageReference.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/MessageReference.java
deleted file mode 100644
index d1bb948..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/MessageReference.java
+++ /dev/null
@@ -1,175 +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.olingo.odata2.api.exception;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * APPLICATION DEVELOPERS: Please use {@link ODataApplicationException} to throw custom exceptions. This class is used inside the library only.
- * <p>A {@link MessageReference} references to the used message for an
- * {@link ODataMessageException} and its sub classes. It supports
- * internationalization and translation of exception messages.
- * <br>Theses classes contain a {@link MessageReference} object which
- * can be mapped to a related key and message text in the resource bundles.
- *
- */
-public abstract class MessageReference {
-
- protected final String key;
- protected List<Object> content = null;
-
- private MessageReference(final String key) {
- this(key, null);
- }
-
- private MessageReference(final String key, final List<Object> content) {
- this.key = key;
- this.content = content;
- }
-
- /**
- * Creates a {@link MessageReference} for given <code>class</code> and <code>key</code>.
- * This combination of <code>class</code> and <code>key</code> has to be provided
- * by a resource bundle.
- * @param clazz {@link ODataMessageException} for which this {@link MessageReference}
- * should be used
- * @param key unique key (in context of {@link ODataMessageException}) for reference
- * to message text in resource bundle
- * @return created {@link MessageReference}
- */
- public static MessageReference create(final Class<? extends ODataException> clazz, final String key) {
- return new SimpleMessageReference(clazz.getName() + "." + key);
- }
-
- public MessageReference create() {
- return new SingleMessageReference(key);
- }
-
- /**
- * Returns message key.
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Adds given content to message reference.
- */
- public MessageReference addContent(final Object... content) {
- if (this.content == null) {
- return new SimpleMessageReference(key, content);
- } else {
- final List<Object> mergedContent = new ArrayList<Object>(this.content.size() + content.length);
- mergedContent.addAll(this.content);
- mergedContent.addAll(Arrays.asList(content));
- return new SimpleMessageReference(key, mergedContent);
- }
- }
-
- /**
- * Receives content for this {@link MessageReference}.
- * Beware that returned list is immutable.
- */
- public List<?> getContent() {
- if (content == null) {
- return Collections.emptyList();
- } else {
- return Collections.unmodifiableList(content);
- }
- }
-
- /**
- * Simple inner class for realization of {@link MessageReference} interface.
- */
- private static class SimpleMessageReference extends MessageReference {
- public SimpleMessageReference(final String implKey) {
- super(implKey);
- }
-
- public SimpleMessageReference(final String implKey, final List<Object> content) {
- super(implKey, content);
- }
-
- public SimpleMessageReference(final String implKey, final Object... content) {
- super(implKey, Arrays.asList(content));
- }
- }
-
- private static class SingleMessageReference extends MessageReference {
- public SingleMessageReference(final String implKey) {
- super(implKey);
- }
-
- public SingleMessageReference(final String implKey, final List<Object> content) {
- super(implKey, content);
- }
-
- public SingleMessageReference(final String implKey, final Object... content) {
- super(implKey, Arrays.asList(content));
- }
-
- @Override
- public MessageReference addContent(final Object... content) {
-
- if (this.content == null) {
- this.content = new ArrayList<Object>();
- }
-
- this.content.addAll(Arrays.asList(content));
- return this;
- }
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((key == null) ? 0 : key.hashCode());
- return result;
- }
-
- /**
- * {@link MessageReference}s are equal if their message keys have the same value.
- * @return <code>true</code> if both instances are equal, otherwise <code>false</code>.
- */
- @Override
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- MessageReference other = (MessageReference) obj;
- if (key == null) {
- if (other.key != null) {
- return false;
- }
- } else if (!key.equals(other.key)) {
- return false;
- }
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataApplicationException.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
deleted file mode 100644
index d4be8ec..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
+++ /dev/null
@@ -1,152 +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.olingo.odata2.api.exception;
-
-import java.util.Locale;
-
-import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
-
-/**
- * This class represents a translated application exception. Use this exception class to display custom exception messages.
- * <br>If a HTTP status is given this exception will result in the set status code like an HTTP exception.
- * <br>A set status code can be used to show a substatus to a HTTP status as described in the OData protocol specification.
- *
- */
-public class ODataApplicationException extends ODataException {
-
- private static final long serialVersionUID = 1L;
- private String errorCode;
- private HttpStatusCodes httpStatus = HttpStatusCodes.INTERNAL_SERVER_ERROR;
- private final Locale locale;
-
- /**
- * Since this is a translated application exception locale must not be null.
- * @param message
- * @param locale
- */
- public ODataApplicationException(final String message, final Locale locale) {
- super(message);
- this.locale = locale;
- }
-
- /**
- * Since this is a translated application exception locale must not be null.
- * <br>The status code given will be displayed at the client.
- * @param message
- * @param locale
- * @param status
- */
- public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status) {
- this(message, locale);
- httpStatus = status;
- }
-
- /**
- * Since this is a translated application exception locale must not be null.
- * <br>The status code given will be displayed at the client.
- * <br>The error code may be used as a substatus for the HTTP status code as described in the OData protocol specification.
- * @param message
- * @param locale
- * @param status
- * @param errorCode
- */
- public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status, final String errorCode) {
- this(message, locale, status);
- this.errorCode = errorCode;
- }
-
- /**
- * Since this is a translated application exception locale must not be null.
- * <br>The status code given will be displayed at the client.
- * <br>The error code may be used as a substatus for the HTTP status code as described in the OData protocol specification.
- * @param message
- * @param locale
- * @param status
- * @param errorCode
- * @param e
- */
- public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status, final String errorCode, final Throwable e) {
- super(message, e);
- this.errorCode = errorCode;
- httpStatus = status;
- this.locale = locale;
- }
-
- /**
- * Since this is a translated application exception locale must not be null.
- * @param message
- * @param locale
- * @param e
- */
- public ODataApplicationException(final String message, final Locale locale, final Throwable e) {
- super(message, e);
- this.locale = locale;
- }
-
- /**
- * Since this is a translated application exception locale must not be null.
- * <br>The status code given will be displayed at the client.
- * @param message
- * @param locale
- * @param status
- * @param e
- */
- public ODataApplicationException(final String message, final Locale locale, final HttpStatusCodes status, final Throwable e) {
- this(message, locale, e);
- httpStatus = status;
- }
-
- /**
- * Since this is a translated application exception locale must not be null.
- * <br>The error code may be used as a substatus for the HTTP status code as described in the OData protocol specification.
- * @param message
- * @param locale
- * @param errorCode
- * @param e
- */
- public ODataApplicationException(final String message, final Locale locale, final String errorCode, final Throwable e) {
- this(message, locale, e);
- this.errorCode = errorCode;
-
- }
-
- /**
- * @return {@link Locale} the locale
- */
- public Locale getLocale() {
- return locale;
- }
-
- /**
- * Default HttpStatusCodes.INTERNAL_SERVER_ERROR
- * @return {@link HttpStatusCodes} the status code
- */
- public HttpStatusCodes getHttpStatus() {
- return httpStatus;
- }
-
- /**
- * Default code is null
- * @return <b>String</b>The error code displayed in the error message.
- */
- public String getCode() {
- return errorCode;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
deleted file mode 100644
index 52afb4f..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
+++ /dev/null
@@ -1,58 +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.olingo.odata2.api.exception;
-
-import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
-
-/**
- * Exceptions of this class will result in a HTTP status 400 bad request
- *
- */
-public class ODataBadRequestException extends ODataHttpException {
-
- private static final long serialVersionUID = 1L;
-
- public static final MessageReference COMMON = createMessageReference(ODataBadRequestException.class, "COMMON");
- public static final MessageReference NOTSUPPORTED = createMessageReference(ODataBadRequestException.class, "NOTSUPPORTED");
- public static final MessageReference URLTOOSHORT = createMessageReference(ODataBadRequestException.class, "URLTOOSHORT");
- public static final MessageReference VERSIONERROR = createMessageReference(ODataBadRequestException.class, "VERSIONERROR");
- public static final MessageReference PARSEVERSIONERROR = createMessageReference(ODataBadRequestException.class, "PARSEVERSIONERROR");
- public static final MessageReference BODY = createMessageReference(ODataBadRequestException.class, "BODY");
- public static final MessageReference AMBIGUOUS_XMETHOD = createMessageReference(ODataBadRequestException.class, "AMBIGUOUS_XMETHOD");
- /** INVALID_HEADER requires 2 content values ('header key' and 'header value') */
- public static final MessageReference INVALID_HEADER = createMessageReference(ODataBadRequestException.class, "INVALID_HEADER");
- /** INVALID_SYNTAX requires NO content values */
- public static final MessageReference INVALID_SYNTAX = createMessageReference(ODataBadRequestException.class, "INVALID_SYNTAX");;
-
- public ODataBadRequestException(final MessageReference messageReference) {
- super(messageReference, HttpStatusCodes.BAD_REQUEST);
- }
-
- public ODataBadRequestException(final MessageReference messageReference, final String errorCode) {
- super(messageReference, HttpStatusCodes.BAD_REQUEST, errorCode);
- }
-
- public ODataBadRequestException(final MessageReference messageReference, final Throwable cause) {
- super(messageReference, cause, HttpStatusCodes.BAD_REQUEST);
- }
-
- public ODataBadRequestException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
- super(messageReference, cause, HttpStatusCodes.BAD_REQUEST, errorCode);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataConflictException.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataConflictException.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataConflictException.java
deleted file mode 100644
index 12ff78e..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataConflictException.java
+++ /dev/null
@@ -1,49 +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.olingo.odata2.api.exception;
-
-import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
-
-/**
- * Exceptions of this class will result in a HTTP status 409 Conflict
- *
- */
-public class ODataConflictException extends ODataHttpException {
-
- private static final long serialVersionUID = 1L;
-
- public static final MessageReference COMMON = createMessageReference(ODataConflictException.class, "COMMON");
-
- public ODataConflictException(final MessageReference context) {
- super(context, HttpStatusCodes.CONFLICT);
- }
-
- public ODataConflictException(final MessageReference context, final Throwable cause) {
- super(context, cause, HttpStatusCodes.CONFLICT);
- }
-
- public ODataConflictException(final MessageReference context, final String errorCode) {
- super(context, HttpStatusCodes.CONFLICT, errorCode);
- }
-
- public ODataConflictException(final MessageReference context, final Throwable cause, final String errorCode) {
- super(context, cause, HttpStatusCodes.CONFLICT, errorCode);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataException.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataException.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataException.java
deleted file mode 100644
index 21c72db..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataException.java
+++ /dev/null
@@ -1,117 +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.olingo.odata2.api.exception;
-
-/**
- * Base exception for all <code>OData</code>-related exceptions.
- *
- */
-public class ODataException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- public ODataException() {
- super();
- }
-
- public ODataException(final String msg) {
- super(msg);
- }
-
- public ODataException(final String msg, final Throwable e) {
- super(msg, e);
- }
-
- public ODataException(final Throwable e) {
- super(e);
- }
-
- /**
- * Checks whether this exception is an or was caused by an {@link ODataHttpException} exception.
- *
- * @return <code>true</code> if this is an or was caused by an {@link ODataHttpException}, otherwise <code>false</code>
- */
- public boolean isCausedByHttpException() {
- return getHttpExceptionCause() != null;
- }
-
- /**
- * Search for and return first (from top) {@link ODataHttpException} in the cause hierarchy.
- * If there is no {@link ODataHttpException} in the cause hierarchy, <code>NULL</code> is returned.
- *
- * @return the first found {@link ODataHttpException} in the cause exception hierarchy
- * or <code>NULL</code> if no {@link ODataHttpException} is found in the cause hierarchy
- */
- public ODataHttpException getHttpExceptionCause() {
- return getSpecificCause(ODataHttpException.class);
- }
-
- /**
- * Checks whether this exception is an or was caused by an {@link ODataApplicationException} exception.
- *
- * @return <code>true</code> if this is an or was caused by an {@link ODataApplicationException}, otherwise <code>false</code>
- */
- public boolean isCausedByApplicationException() {
- return getApplicationExceptionCause() != null;
- }
-
- /**
- * Checks whether this exception is an or was caused by an {@link ODataMessageException} exception.
- *
- * @return <code>true</code> if this is an or was caused by an {@link ODataMessageException}, otherwise <code>false</code>
- */
- public boolean isCausedByMessageException() {
- return getMessageExceptionCause() != null;
- }
-
- /**
- * Search for and return first (from top) {@link ODataMessageException} in the cause hierarchy.
- * If there is no {@link ODataMessageException} in the cause hierarchy <code>NULL</code> is returned.
- *
- * @return the first found {@link ODataMessageException} in the cause exception hierarchy
- * or <code>NULL</code> if no {@link ODataMessageException} is found in the cause hierarchy
- */
- public ODataMessageException getMessageExceptionCause() {
- return getSpecificCause(ODataMessageException.class);
- }
-
- /**
- * Search for and return first (from top) {@link ODataApplicationException} in the cause hierarchy.
- * If there is no {@link ODataApplicationException} in the cause hierarchy <code>NULL</code> is returned.
- *
- * @return the first found {@link ODataApplicationException} in the cause exception hierarchy
- * or <code>NULL</code> if no {@link ODataApplicationException} is found in the cause hierarchy
- */
- public ODataApplicationException getApplicationExceptionCause() {
- return getSpecificCause(ODataApplicationException.class);
- }
-
- private <T extends ODataException> T getSpecificCause(final Class<T> causeClass) {
- Throwable cause = this;
- while (cause != null) {
- if (causeClass.isInstance(cause)) {
- return causeClass.cast(cause);
- } else {
- cause = cause.getCause();
- }
- }
-
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
deleted file mode 100644
index 92e0dbb..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
+++ /dev/null
@@ -1,48 +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.olingo.odata2.api.exception;
-
-import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
-
-/**
- * Exceptions of this class will result in a HTTP status 403 forbidden
- *
- */
-public class ODataForbiddenException extends ODataHttpException {
-
- private static final long serialVersionUID = 1L;
-
- public static final MessageReference COMMON = createMessageReference(ODataForbiddenException.class, "COMMON");
-
- public ODataForbiddenException(final MessageReference context) {
- super(context, HttpStatusCodes.FORBIDDEN);
- }
-
- public ODataForbiddenException(final MessageReference context, final Throwable cause) {
- super(context, cause, HttpStatusCodes.FORBIDDEN);
- }
-
- public ODataForbiddenException(final MessageReference context, final String errorCode) {
- super(context, HttpStatusCodes.FORBIDDEN, errorCode);
- }
-
- public ODataForbiddenException(final MessageReference context, final Throwable cause, final String errorCode) {
- super(context, cause, HttpStatusCodes.FORBIDDEN, errorCode);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataHttpException.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataHttpException.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataHttpException.java
deleted file mode 100644
index f412de1..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataHttpException.java
+++ /dev/null
@@ -1,55 +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.olingo.odata2.api.exception;
-
-import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
-
-/**
- * {@link ODataMessageException} with a HTTP status code.
- *
- */
-public abstract class ODataHttpException extends ODataMessageException {
-
- private static final long serialVersionUID = 1L;
-
- protected final HttpStatusCodes httpStatus;
-
- public static final MessageReference COMMON = createMessageReference(ODataHttpException.class, "COMMON");
-
- public ODataHttpException(final MessageReference messageReference, final HttpStatusCodes httpStatus) {
- this(messageReference, null, httpStatus);
- }
-
- public ODataHttpException(final MessageReference messageReference, final HttpStatusCodes httpStatus, final String errorCode) {
- this(messageReference, null, httpStatus, errorCode);
- }
-
- public ODataHttpException(final MessageReference messageReference, final Throwable cause, final HttpStatusCodes httpStatus) {
- this(messageReference, cause, httpStatus, null);
- }
-
- public ODataHttpException(final MessageReference messageReference, final Throwable cause, final HttpStatusCodes httpStatus, final String errorCode) {
- super(messageReference, cause, errorCode);
- this.httpStatus = httpStatus;
- }
-
- public HttpStatusCodes getHttpStatus() {
- return httpStatus;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataMessageException.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataMessageException.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataMessageException.java
deleted file mode 100644
index 759e941..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataMessageException.java
+++ /dev/null
@@ -1,114 +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.olingo.odata2.api.exception;
-
-/**
- * <p>DO NOT EXTEND THIS EXCEPTION</p>
- * APPLICATION DEVELOPERS: please use {@link ODataApplicationException} o throw custom exceptions.
- * <p>Base exception class for all exceptions in the <code>OData</code> library.
- * This class extends {@link ODataException} with a message that will be displayed
- * to a possible client and therefore needs support for internationalization.
- * <br>To support internationalization and translation of messages, this class
- * and its sub classes contain a {@link MessageReference} object which can be
- * mapped to a related key and message text in the resource bundles.
- *
- */
-public abstract class ODataMessageException extends ODataException {
-
- private static final long serialVersionUID = 42L;
-
- /** Message reference for exception which is used for internationalization */
- protected final MessageReference messageReference;
- /** OData error code */
- protected final String errorCode;
-
- /** Reference to common message for a {@link ODataMessageException} */
- public static final MessageReference COMMON = createMessageReference(ODataMessageException.class, "COMMON");
-
- /**
- * Creates {@link ODataMessageException} with given {@link MessageReference}.
- * @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- */
- public ODataMessageException(final MessageReference messageReference) {
- this(messageReference, null, null);
- }
-
- /**
- * Creates {@link ODataMessageException} with given {@link MessageReference}
- * and cause {@link Throwable} which caused this exception.
- * @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- * @param cause exception which caused this exception
- */
- public ODataMessageException(final MessageReference messageReference, final Throwable cause) {
- this(messageReference, cause, null);
- }
-
- /**
- * Creates {@link ODataMessageException} with given {@link MessageReference},
- * cause {@link Throwable} and error code.
- * @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- * @param cause exception which caused this exception
- * @param errorCode a String with a unique code identifying this exception
- */
- public ODataMessageException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
- super(cause);
- this.messageReference = messageReference;
- this.errorCode = errorCode;
- }
-
- /**
- * Creates {@link ODataMessageException} with given {@link MessageReference} and error code.
- * @param messageReference references the message text (and additional values)
- * of this {@link ODataMessageException}
- * @param errorCode a String with a unique code identifying this exception
- */
- public ODataMessageException(final MessageReference messageReference, final String errorCode) {
- this(messageReference, null, errorCode);
- }
-
- /**
- * Creates {@link MessageReference} objects more conveniently.
- * @param clazz exception class for message reference
- * @param messageReferenceKey unique (in exception class) key for message reference
- * @return created message-reference instance
- */
- protected static final MessageReference createMessageReference(final Class<? extends ODataMessageException> clazz, final String messageReferenceKey) {
- return MessageReference.create(clazz, messageReferenceKey);
- }
-
- /**
- * Gets the related {@link MessageReference}.
- * @return the message reference
- */
- public MessageReference getMessageReference() {
- return messageReference;
- }
-
- /**
- * Gets the error code for this {@link ODataMessageException}.
- * Default is <code>null</code>.
- * @return the error code
- */
- public String getErrorCode() {
- return errorCode;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/fece4008/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
----------------------------------------------------------------------
diff --git a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java b/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
deleted file mode 100644
index d9250bf..0000000
--- a/aggregated-sources/org.apache.olingo.odata2-parent-sources/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
+++ /dev/null
@@ -1,49 +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.olingo.odata2.api.exception;
-
-import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
-
-/**
- * Exceptions of this class will result in a HTTP status 405 (method not allowed).
- *
- */
-public class ODataMethodNotAllowedException extends ODataHttpException {
-
- private static final long serialVersionUID = 1L;
-
- public static final MessageReference DISPATCH = createMessageReference(ODataMethodNotAllowedException.class, "DISPATCH");
-
- public ODataMethodNotAllowedException(final MessageReference messageReference) {
- super(messageReference, HttpStatusCodes.METHOD_NOT_ALLOWED);
- }
-
- public ODataMethodNotAllowedException(final MessageReference messageReference, final Throwable cause) {
- super(messageReference, cause, HttpStatusCodes.METHOD_NOT_ALLOWED);
- }
-
- public ODataMethodNotAllowedException(final MessageReference messageReference, final String errorCode) {
- super(messageReference, HttpStatusCodes.METHOD_NOT_ALLOWED, errorCode);
- }
-
- public ODataMethodNotAllowedException(final MessageReference messageReference, final Throwable cause, final String errorCode) {
- super(messageReference, cause, HttpStatusCodes.METHOD_NOT_ALLOWED, errorCode);
- }
-
-}