You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/03/16 04:14:13 UTC
git commit: change package name: part 2 of 1.edm->edm.shared, 2,
edm.v4->edm
Repository: incubator-olingo-odata4
Updated Branches:
refs/heads/olingo191 64564c2d6 -> 5950ada28
change package name: part 2 of 1.edm->edm.shared, 2, edm.v4->edm
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/5950ada2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/5950ada2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/5950ada2
Branch: refs/heads/olingo191
Commit: 5950ada2849b353a830728dacdc0ecdaada29185
Parents: 64564c2
Author: challenh <ch...@apache.org>
Authored: Sun Mar 16 11:13:37 2014 +0800
Committer: challenh <ch...@apache.org>
Committed: Sun Mar 16 11:13:37 2014 +0800
----------------------------------------------------------------------
.../client/core/edm/EdmServiceMetadataImpl.java | 105 +++++++++++++++++++
.../shared/AbstractEdmServiceMetadataImpl.java | 2 +-
.../core/edm/v4/EdmServiceMetadataImpl.java | 105 -------------------
3 files changed, 106 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5950ada2/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmServiceMetadataImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmServiceMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmServiceMetadataImpl.java
new file mode 100644
index 0000000..74f10cf
--- /dev/null
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmServiceMetadataImpl.java
@@ -0,0 +1,105 @@
+/*
+ * 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.client.core.edm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.olingo.client.api.edm.xml.CommonFunctionImport;
+import org.apache.olingo.client.api.edm.xml.v4.ActionImport;
+import org.apache.olingo.client.api.edm.xml.v4.EntityContainer;
+import org.apache.olingo.client.api.edm.xml.v4.Schema;
+import org.apache.olingo.client.api.edm.xml.v4.Singleton;
+import org.apache.olingo.client.core.edm.shared.AbstractEdmServiceMetadataImpl;
+import org.apache.olingo.client.core.edm.xml.v4.XMLMetadataImpl;
+import org.apache.olingo.commons.api.edm.EdmActionImportInfo;
+import org.apache.olingo.commons.api.edm.EdmFunctionImportInfo;
+import org.apache.olingo.commons.api.edm.EdmSingletonInfo;
+import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
+import org.apache.olingo.commons.core.edm.EdmActionImportInfoImpl;
+import org.apache.olingo.commons.core.edm.EdmFunctionImportInfoImpl;
+import org.apache.olingo.commons.core.edm.EdmSingletonInfoImpl;
+
+public class EdmServiceMetadataImpl extends AbstractEdmServiceMetadataImpl {
+
+ private static final ODataServiceVersion SERVICE_VERSION = ODataServiceVersion.V40;
+
+ private List<EdmSingletonInfo> singletonInfos;
+
+ private List<EdmActionImportInfo> actionImportInfos;
+
+ public EdmServiceMetadataImpl(final XMLMetadataImpl xmlMetadata) {
+ super(xmlMetadata);
+ }
+
+ @Override
+ public String getDataServiceVersion() {
+ return SERVICE_VERSION.toString();
+ }
+
+ @Override
+ public List<EdmSingletonInfo> getSingletonInfos() {
+ synchronized (this) {
+ if (singletonInfos == null) {
+ singletonInfos = new ArrayList<EdmSingletonInfo>();
+ for (Schema schema : ((XMLMetadataImpl) xmlMetadata).getSchemas()) {
+ final EntityContainer entityContainer = (EntityContainer) schema.getDefaultEntityContainer();
+ for (Singleton singleton : entityContainer.getSingletons()) {
+ singletonInfos.add(new EdmSingletonInfoImpl(entityContainer.getName(), singleton.getName()));
+ }
+ }
+ }
+ return singletonInfos;
+ }
+ }
+
+ @Override
+ public List<EdmFunctionImportInfo> getFunctionImportInfos() {
+ synchronized (this) {
+ if (functionImportInfos == null) {
+ functionImportInfos = new ArrayList<EdmFunctionImportInfo>();
+ for (Schema schema : ((XMLMetadataImpl) xmlMetadata).getSchemas()) {
+ for (EntityContainer entityContainer : schema.getEntityContainers()) {
+ for (CommonFunctionImport functionImport : entityContainer.getFunctionImports()) {
+ functionImportInfos.add(
+ new EdmFunctionImportInfoImpl(entityContainer.getName(), functionImport.getName()));
+ }
+ }
+ }
+ }
+ }
+ return functionImportInfos;
+ }
+
+ @Override
+ public List<EdmActionImportInfo> getActionImportInfos() {
+ synchronized (this) {
+ if (actionImportInfos == null) {
+ actionImportInfos = new ArrayList<EdmActionImportInfo>();
+ for (Schema schema : ((XMLMetadataImpl) xmlMetadata).getSchemas()) {
+ final EntityContainer entityContainer = (EntityContainer) schema.getDefaultEntityContainer();
+ for (ActionImport actionImport : entityContainer.getActionImports()) {
+ actionImportInfos.add(new EdmActionImportInfoImpl(entityContainer.getName(), actionImport.getName()));
+ }
+ }
+ }
+ return actionImportInfos;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5950ada2/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/shared/AbstractEdmServiceMetadataImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/shared/AbstractEdmServiceMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/shared/AbstractEdmServiceMetadataImpl.java
index f413e51..5865ae9 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/shared/AbstractEdmServiceMetadataImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/shared/AbstractEdmServiceMetadataImpl.java
@@ -50,7 +50,7 @@ public abstract class AbstractEdmServiceMetadataImpl implements EdmServiceMetada
return xmlMetadata instanceof org.apache.olingo.client.core.edm.xml.v3.XMLMetadataImpl
? new org.apache.olingo.client.core.edm.v3.EdmServiceMetadataImpl(
(org.apache.olingo.client.core.edm.xml.v3.XMLMetadataImpl) xmlMetadata)
- : new org.apache.olingo.client.core.edm.v4.EdmServiceMetadataImpl(
+ : new org.apache.olingo.client.core.edm.EdmServiceMetadataImpl(
(org.apache.olingo.client.core.edm.xml.v4.XMLMetadataImpl) xmlMetadata);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5950ada2/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/EdmServiceMetadataImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/EdmServiceMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/EdmServiceMetadataImpl.java
deleted file mode 100644
index 9816416..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/EdmServiceMetadataImpl.java
+++ /dev/null
@@ -1,105 +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.client.core.edm.v4;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.olingo.client.api.edm.xml.CommonFunctionImport;
-import org.apache.olingo.client.api.edm.xml.v4.ActionImport;
-import org.apache.olingo.client.api.edm.xml.v4.EntityContainer;
-import org.apache.olingo.client.api.edm.xml.v4.Schema;
-import org.apache.olingo.client.api.edm.xml.v4.Singleton;
-import org.apache.olingo.client.core.edm.shared.AbstractEdmServiceMetadataImpl;
-import org.apache.olingo.client.core.edm.xml.v4.XMLMetadataImpl;
-import org.apache.olingo.commons.api.edm.EdmActionImportInfo;
-import org.apache.olingo.commons.api.edm.EdmFunctionImportInfo;
-import org.apache.olingo.commons.api.edm.EdmSingletonInfo;
-import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
-import org.apache.olingo.commons.core.edm.EdmActionImportInfoImpl;
-import org.apache.olingo.commons.core.edm.EdmFunctionImportInfoImpl;
-import org.apache.olingo.commons.core.edm.EdmSingletonInfoImpl;
-
-public class EdmServiceMetadataImpl extends AbstractEdmServiceMetadataImpl {
-
- private static final ODataServiceVersion SERVICE_VERSION = ODataServiceVersion.V40;
-
- private List<EdmSingletonInfo> singletonInfos;
-
- private List<EdmActionImportInfo> actionImportInfos;
-
- public EdmServiceMetadataImpl(final XMLMetadataImpl xmlMetadata) {
- super(xmlMetadata);
- }
-
- @Override
- public String getDataServiceVersion() {
- return SERVICE_VERSION.toString();
- }
-
- @Override
- public List<EdmSingletonInfo> getSingletonInfos() {
- synchronized (this) {
- if (singletonInfos == null) {
- singletonInfos = new ArrayList<EdmSingletonInfo>();
- for (Schema schema : ((XMLMetadataImpl) xmlMetadata).getSchemas()) {
- final EntityContainer entityContainer = (EntityContainer) schema.getDefaultEntityContainer();
- for (Singleton singleton : entityContainer.getSingletons()) {
- singletonInfos.add(new EdmSingletonInfoImpl(entityContainer.getName(), singleton.getName()));
- }
- }
- }
- return singletonInfos;
- }
- }
-
- @Override
- public List<EdmFunctionImportInfo> getFunctionImportInfos() {
- synchronized (this) {
- if (functionImportInfos == null) {
- functionImportInfos = new ArrayList<EdmFunctionImportInfo>();
- for (Schema schema : ((XMLMetadataImpl) xmlMetadata).getSchemas()) {
- for (EntityContainer entityContainer : schema.getEntityContainers()) {
- for (CommonFunctionImport functionImport : entityContainer.getFunctionImports()) {
- functionImportInfos.add(
- new EdmFunctionImportInfoImpl(entityContainer.getName(), functionImport.getName()));
- }
- }
- }
- }
- }
- return functionImportInfos;
- }
-
- @Override
- public List<EdmActionImportInfo> getActionImportInfos() {
- synchronized (this) {
- if (actionImportInfos == null) {
- actionImportInfos = new ArrayList<EdmActionImportInfo>();
- for (Schema schema : ((XMLMetadataImpl) xmlMetadata).getSchemas()) {
- final EntityContainer entityContainer = (EntityContainer) schema.getDefaultEntityContainer();
- for (ActionImport actionImport : entityContainer.getActionImports()) {
- actionImportInfos.add(new EdmActionImportInfoImpl(entityContainer.getName(), actionImport.getName()));
- }
- }
- }
- return actionImportInfos;
- }
- }
-}