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 2013/09/20 15:34:08 UTC
[46/59] [abbrv] git commit: cleanup of odata testutil
cleanup of odata testutil
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/afcc636a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/afcc636a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/afcc636a
Branch: refs/heads/master
Commit: afcc636a83be53895b27937468d285906fee258d
Parents: de63728
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 15:01:53 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 15:01:53 2013 +0200
----------------------------------------------------------------------
.../testutil/TestUtilRuntimeException.java | 30 ++---
.../odata2/testutil/fit/AbstractFitTest.java | 31 +++--
.../olingo/odata2/testutil/fit/BaseTest.java | 30 ++---
.../odata2/testutil/fit/FitErrorCallback.java | 31 +++--
.../testutil/fit/FitStaticServiceFactory.java | 29 ++---
.../testutil/fit/Log4JConfigurationTest.java | 26 ++--
.../odata2/testutil/helper/ClassHelper.java | 29 ++---
.../odata2/testutil/helper/HttpMerge.java | 26 ++--
.../helper/HttpSomethingUnsupported.java | 26 ++--
.../helper/ODataMessageTextVerifier.java | 37 +++---
.../odata2/testutil/helper/ProcessLocker.java | 33 +++--
.../odata2/testutil/helper/StringHelper.java | 30 ++---
.../odata2/testutil/helper/XMLUnitHelper.java | 31 ++---
.../olingo/odata2/testutil/mock/EdmMock.java | 71 ++++++-----
.../odata2/testutil/mock/EdmTestProvider.java | 121 ++++++++++++-------
.../olingo/odata2/testutil/mock/MockFacade.java | 31 +++--
.../SampleClassForInvalidMessageReferences.java | 35 +++---
.../olingo/odata2/testutil/mock/TecEdmInfo.java | 28 ++---
.../mock/TechnicalScenarioEdmProvider.java | 55 +++++----
.../testutil/server/ServerRuntimeException.java | 26 ++--
.../odata2/testutil/server/TestServer.java | 38 +++---
21 files changed, 428 insertions(+), 366 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
index b3b2f7a..ec8f3f5 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
@@ -1,27 +1,27 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil;
/**
* This class is a helper to throw RuntimeExceptions in test util methods
- *
- *
+ *
+ *
*/
public class TestUtilRuntimeException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
index 74fda3d..1a2362b 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.fit;
@@ -22,14 +22,13 @@ import java.net.URI;
import org.apache.http.client.HttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.junit.After;
-import org.junit.Before;
-
import org.apache.olingo.odata2.api.ODataService;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
import org.apache.olingo.odata2.testutil.server.ServerRuntimeException;
import org.apache.olingo.odata2.testutil.server.TestServer;
+import org.junit.After;
+import org.junit.Before;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
index 26520db..b1deda1 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.fit;
@@ -34,7 +34,7 @@ import org.junit.runner.Description;
* Provides basic support for JUnit tests<br>
* - log & tracing
*
- *
+ *
*/
public abstract class BaseTest {
@@ -79,7 +79,7 @@ public abstract class BaseTest {
/**
* Disable logging.
- * <br />
+ * <br />
* Disabled logging will be automatically re-enabled after test execution (see {@link #reEnableLogging()}).
*/
protected void disableLogging() {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
index 5a63e58..fb8ff25 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
@@ -1,32 +1,31 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.fit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
import org.apache.olingo.odata2.api.ep.EntityProvider;
import org.apache.olingo.odata2.api.exception.ODataApplicationException;
import org.apache.olingo.odata2.api.processor.ODataErrorCallback;
import org.apache.olingo.odata2.api.processor.ODataErrorContext;
import org.apache.olingo.odata2.api.processor.ODataResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
index ea1d7a4..b484661 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.fit;
@@ -48,7 +48,8 @@ public class FitStaticServiceFactory extends ODataServiceFactory {
return super.getCallback(callbackInterface);
}
- private static Map<String, ODataService> PORT_2_SERVICE = Collections.synchronizedMap(new HashMap<String, ODataService>());
+ private static Map<String, ODataService> PORT_2_SERVICE = Collections
+ .synchronizedMap(new HashMap<String, ODataService>());
public static void bindService(final TestServer server, final ODataService service) {
PORT_2_SERVICE.put(createId(server), service);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java
index f7c7449..9f17766 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/Log4JConfigurationTest.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.fit;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
index 8100b72..78ee9b7 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.helper;
@@ -69,7 +69,8 @@ public class ClassHelper {
* @param ctorParameterClasses
* @param ctorParameters
*/
- public static <T> List<T> getClassInstances(final List<Class<T>> exClasses, final Class<?>[] ctorParameterClasses, final Object[] ctorParameters) {
+ public static <T> List<T> getClassInstances(final List<Class<T>> exClasses, final Class<?>[] ctorParameterClasses,
+ final Object[] ctorParameters) {
final List<T> toTestExceptions = new ArrayList<T>();
for (final Class<T> clazz : exClasses) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java
index 9a563b1..918a083 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpMerge.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.helper;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java
index 0bdfa66..8b4b20c 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/HttpSomethingUnsupported.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.helper;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
index 1c0816a..2f510bc 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.helper;
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
* test whether all fields of type {@link MessageReference} of
* the tested (Exception) class are provided in the <b>i18n.properties</b> file.
*
- *
+ *
*/
public class ODataMessageTextVerifier {
@@ -103,15 +103,18 @@ public class ODataMessageTextVerifier {
try {
msgRef = (MessageReference) field.get(null);
} catch (final IllegalArgumentException e) {
- failCollector("MsgRef Error--> Error: MsgRef " + field.getName() + " of class \"" + testClass.getSimpleName() + "\"");
+ failCollector("MsgRef Error--> Error: MsgRef " + field.getName() + " of class \"" + testClass.getSimpleName()
+ + "\"");
break;
} catch (final IllegalAccessException e) {
- failCollector("MsgRef Error--> Not public: MsgRef " + field.getName() + " of class \"" + testClass.getSimpleName() + "\"");
+ failCollector("MsgRef Error--> Not public: MsgRef " + field.getName() + " of class \""
+ + testClass.getSimpleName() + "\"");
break;
}
if (msgRef == null) {
- failCollector("MsgRef Error--> Not assigned: MsgRef " + field.getName() + " of class \"" + testClass.getSimpleName() + "\"");
+ failCollector("MsgRef Error--> Not assigned: MsgRef " + field.getName() + " of class \""
+ + testClass.getSimpleName() + "\"");
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
index c4a2a9f..4f5fbc3 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.helper;
@@ -24,22 +24,21 @@ import java.io.RandomAccessFile;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
+import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
-
/**
* Interprocess synchronization to enable parallel test executions.
*
- *
+ *
*/
public class ProcessLocker {
@SuppressWarnings("unused")
private static final Logger log = LoggerFactory.getLogger(ProcessLocker.class);
- //Acquire
+ // Acquire
public static void crossProcessLockAcquire(final Class<?> c, final long waitMS) {
RandomAccessFile randomAccessFile = null;
if ((fileLock == null) && (c != null) && (waitMS > 0)) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
index bf2e24e..ef3b59c 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.helper;
@@ -28,7 +28,6 @@ import java.nio.charset.Charset;
import java.util.Random;
import org.apache.http.HttpEntity;
-
import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
/**
@@ -86,7 +85,8 @@ public class StringHelper {
* @return content as stream
* @throws UnsupportedEncodingException if charset is not supported
*/
- public static InputStream encapsulate(final String content, final String charset) throws UnsupportedEncodingException {
+ public static InputStream encapsulate(final String content, final String charset)
+ throws UnsupportedEncodingException {
return new ByteArrayInputStream(content.getBytes(charset));
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
index fa2520d..3992bc1 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.helper;
@@ -26,7 +26,7 @@ import org.junit.Assert;
/**
* Helper for XML unit tests.
- *
+ *
*/
public class XMLUnitHelper {
@@ -44,7 +44,8 @@ public class XMLUnitHelper {
if (m.find()) {
final int currentTagPos = m.start();
- Assert.assertTrue("Tag with name '" + tagName + "' is not in correct order. Expected order is '" + Arrays.toString(toCheckTags) + "'.",
+ Assert.assertTrue("Tag with name '" + tagName + "' is not in correct order. Expected order is '"
+ + Arrays.toString(toCheckTags) + "'.",
lastTagPos < currentTagPos);
lastTagPos = currentTagPos;
} else {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
index 9ffe44a..66a5708 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.mock;
@@ -23,8 +23,6 @@ import static org.mockito.Mockito.when;
import java.util.Arrays;
-import org.mockito.Mockito;
-
import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.edm.EdmComplexType;
@@ -50,10 +48,11 @@ import org.apache.olingo.odata2.api.edm.EdmTypeKind;
import org.apache.olingo.odata2.api.edm.EdmTyped;
import org.apache.olingo.odata2.api.edm.provider.CustomizableFeedMappings;
import org.apache.olingo.odata2.api.exception.ODataException;
+import org.mockito.Mockito;
/**
* Mocked Entity Data Model, more or less aligned to the Reference Scenario.
- *
+ *
*/
class EdmMock {
@@ -61,11 +60,14 @@ class EdmMock {
EdmEntityContainer defaultContainer = mock(EdmEntityContainer.class);
when(defaultContainer.isDefaultEntityContainer()).thenReturn(true);
- final EdmEntitySet employeeEntitySet = createEntitySetMock(defaultContainer, "Employees", EdmSimpleTypeKind.String, "EmployeeId");
+ final EdmEntitySet employeeEntitySet =
+ createEntitySetMock(defaultContainer, "Employees", EdmSimpleTypeKind.String, "EmployeeId");
final EdmEntitySet teamEntitySet = createEntitySetMock(defaultContainer, "Teams", EdmSimpleTypeKind.String, "Id");
final EdmEntitySet roomEntitySet = createEntitySetMock(defaultContainer, "Rooms", EdmSimpleTypeKind.String, "Id");
- final EdmEntitySet managerEntitySet = createEntitySetMock(defaultContainer, "Managers", EdmSimpleTypeKind.String, "EmployeeId");
- final EdmEntitySet buildingEntitySet = createEntitySetMock(defaultContainer, "Buildings", EdmSimpleTypeKind.String, "Id");
+ final EdmEntitySet managerEntitySet =
+ createEntitySetMock(defaultContainer, "Managers", EdmSimpleTypeKind.String, "EmployeeId");
+ final EdmEntitySet buildingEntitySet =
+ createEntitySetMock(defaultContainer, "Buildings", EdmSimpleTypeKind.String, "Id");
EdmEntityType employeeType = employeeEntitySet.getEntityType();
when(employeeType.hasStream()).thenReturn(true);
@@ -166,17 +168,22 @@ class EdmMock {
when(buildingType.getNavigationPropertyNames()).thenReturn(Arrays.asList("nb_Rooms"));
createNavigationProperty("nb_Rooms", EdmMultiplicity.MANY, buildingEntitySet, roomEntitySet);
- EdmFunctionImport employeeSearchFunctionImport = createFunctionImportMock(defaultContainer, "EmployeeSearch", employeeType, EdmMultiplicity.MANY);
+ EdmFunctionImport employeeSearchFunctionImport =
+ createFunctionImportMock(defaultContainer, "EmployeeSearch", employeeType, EdmMultiplicity.MANY);
when(employeeSearchFunctionImport.getEntitySet()).thenReturn(employeeEntitySet);
EdmParameter employeeSearchParameter = mock(EdmParameter.class);
when(employeeSearchParameter.getType()).thenReturn(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance());
when(employeeSearchFunctionImport.getParameterNames()).thenReturn(Arrays.asList("q"));
when(employeeSearchFunctionImport.getParameter("q")).thenReturn(employeeSearchParameter);
createFunctionImportMock(defaultContainer, "AllLocations", locationComplexType, EdmMultiplicity.MANY);
- createFunctionImportMock(defaultContainer, "AllUsedRoomIds", EdmSimpleTypeKind.String.getEdmSimpleTypeInstance(), EdmMultiplicity.MANY);
- createFunctionImportMock(defaultContainer, "MaximalAge", EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance(), EdmMultiplicity.ONE);
+ createFunctionImportMock(defaultContainer, "AllUsedRoomIds", EdmSimpleTypeKind.String.getEdmSimpleTypeInstance(),
+ EdmMultiplicity.MANY);
+ createFunctionImportMock(defaultContainer, "MaximalAge", EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance(),
+ EdmMultiplicity.ONE);
createFunctionImportMock(defaultContainer, "MostCommonLocation", locationComplexType, EdmMultiplicity.ONE);
- EdmFunctionImport managerPhotoFunctionImport = createFunctionImportMock(defaultContainer, "ManagerPhoto", EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance(), EdmMultiplicity.ONE);
+ EdmFunctionImport managerPhotoFunctionImport =
+ createFunctionImportMock(defaultContainer, "ManagerPhoto", EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance(),
+ EdmMultiplicity.ONE);
EdmParameter managerPhotoParameter = mock(EdmParameter.class);
when(managerPhotoParameter.getType()).thenReturn(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance());
EdmFacets managerPhotoParameterFacets = mock(EdmFacets.class);
@@ -184,7 +191,8 @@ class EdmMock {
when(managerPhotoParameter.getFacets()).thenReturn(managerPhotoParameterFacets);
when(managerPhotoFunctionImport.getParameterNames()).thenReturn(Arrays.asList("Id"));
when(managerPhotoFunctionImport.getParameter("Id")).thenReturn(managerPhotoParameter);
- EdmFunctionImport oldestEmployeeFunctionImport = createFunctionImportMock(defaultContainer, "OldestEmployee", employeeType, EdmMultiplicity.ONE);
+ EdmFunctionImport oldestEmployeeFunctionImport =
+ createFunctionImportMock(defaultContainer, "OldestEmployee", employeeType, EdmMultiplicity.ONE);
when(oldestEmployeeFunctionImport.getEntitySet()).thenReturn(employeeEntitySet);
EdmEntityContainer specificContainer = mock(EdmEntityContainer.class);
@@ -266,7 +274,8 @@ class EdmMock {
return edm;
}
- private static EdmNavigationProperty createNavigationProperty(final String name, final EdmMultiplicity multiplicity, final EdmEntitySet entitySet, final EdmEntitySet targetEntitySet) throws EdmException {
+ private static EdmNavigationProperty createNavigationProperty(final String name, final EdmMultiplicity multiplicity,
+ final EdmEntitySet entitySet, final EdmEntitySet targetEntitySet) throws EdmException {
EdmType navigationType = mock(EdmType.class);
when(navigationType.getKind()).thenReturn(EdmTypeKind.ENTITY);
@@ -281,7 +290,8 @@ class EdmMock {
return navigationProperty;
}
- private static EdmProperty createProperty(final String name, final EdmSimpleTypeKind kind, final EdmStructuralType entityType) throws EdmException {
+ private static EdmProperty createProperty(final String name, final EdmSimpleTypeKind kind,
+ final EdmStructuralType entityType) throws EdmException {
EdmProperty property = mock(EdmProperty.class);
when(property.getType()).thenReturn(kind.getEdmSimpleTypeInstance());
when(property.getName()).thenReturn(name);
@@ -289,7 +299,8 @@ class EdmMock {
return property;
}
- private static EdmEntitySet createEntitySetMock(final EdmEntityContainer container, final String name, final EdmSimpleTypeKind kind, final String keyPropertyId) throws EdmException {
+ private static EdmEntitySet createEntitySetMock(final EdmEntityContainer container, final String name,
+ final EdmSimpleTypeKind kind, final String keyPropertyId) throws EdmException {
final EdmEntityType entityType = createEntityTypeMock(name.substring(0, name.length() - 1), kind, keyPropertyId);
EdmEntitySet entitySet = mock(EdmEntitySet.class);
@@ -303,7 +314,8 @@ class EdmMock {
return entitySet;
}
- private static EdmEntityType createEntityTypeMock(final String name, final EdmSimpleTypeKind kind, final String keyPropertyId) throws EdmException {
+ private static EdmEntityType createEntityTypeMock(final String name, final EdmSimpleTypeKind kind,
+ final String keyPropertyId) throws EdmException {
EdmEntityType entityType = mock(EdmEntityType.class);
when(entityType.getName()).thenReturn(name);
when(entityType.getNamespace()).thenReturn("RefScenario");
@@ -322,7 +334,8 @@ class EdmMock {
return entityType;
}
- private static EdmFunctionImport createFunctionImportMock(final EdmEntityContainer container, final String name, final EdmType type, final EdmMultiplicity multiplicity) throws EdmException {
+ private static EdmFunctionImport createFunctionImportMock(final EdmEntityContainer container, final String name,
+ final EdmType type, final EdmMultiplicity multiplicity) throws EdmException {
EdmTyped returnType = mock(EdmTyped.class);
when(returnType.getType()).thenReturn(type);
when(returnType.getMultiplicity()).thenReturn(multiplicity);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
index 72a1296..cb9392b 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.mock;
@@ -161,14 +161,18 @@ public class EdmTestProvider extends EdmProvider {
final List<AnnotationElement> childElements = new ArrayList<AnnotationElement>();
childElements.add(new AnnotationElement().setName("schemaElementTest2").setText("text2").setNamespace(NAMESPACE_1));
- childElements.add(new AnnotationElement().setName("schemaElementTest3").setText("text3").setPrefix("prefix").setNamespace("namespace"));
+ childElements.add(new AnnotationElement().setName("schemaElementTest3").setText("text3").setPrefix("prefix")
+ .setNamespace("namespace"));
final List<AnnotationAttribute> elementAttributes = new ArrayList<AnnotationAttribute>();
elementAttributes.add(new AnnotationAttribute().setName("rel").setText("self"));
- elementAttributes.add(new AnnotationAttribute().setName("href").setText("http://foo").setPrefix("pre").setNamespace("namespaceForAnno"));
- childElements.add(new AnnotationElement().setName("schemaElementTest4").setText("text4").setAttributes(elementAttributes));
+ elementAttributes.add(new AnnotationAttribute().setName("href").setText("http://foo").setPrefix("pre")
+ .setNamespace("namespaceForAnno"));
+ childElements.add(new AnnotationElement().setName("schemaElementTest4").setText("text4").setAttributes(
+ elementAttributes));
final List<AnnotationElement> schemaElements = new ArrayList<AnnotationElement>();
- schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setText("text1").setChildElements(childElements));
+ schemaElements.add(new AnnotationElement().setName("schemaElementTest1").setText("text1").setChildElements(
+ childElements));
schema.setAnnotationElements(schemaElements);
schemas.add(schema);
@@ -194,24 +198,30 @@ public class EdmTestProvider extends EdmProvider {
if (ENTITY_TYPE_1_1.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
final ArrayList<AnnotationAttribute> annoList = new ArrayList<AnnotationAttribute>();
- annoList.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespace").setPrefix("annoPrefix").setText("annoText"));
- annoList.add(new AnnotationAttribute().setName("annoName2").setNamespace("http://annoNamespace").setPrefix("annoPrefix").setText("annoText2"));
+ annoList.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespace").setPrefix(
+ "annoPrefix").setText("annoText"));
+ annoList.add(new AnnotationAttribute().setName("annoName2").setNamespace("http://annoNamespace").setPrefix(
+ "annoPrefix").setText("annoText2"));
properties.add(new SimpleProperty().setName("EmployeeId").setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false))
.setMapping(new Mapping().setInternalName("getId")).setAnnotationAttributes(annoList));
final ArrayList<AnnotationAttribute> annoList2 = new ArrayList<AnnotationAttribute>();
- annoList2.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespace").setPrefix("annoPrefix").setText("annoText"));
+ annoList2.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespace").setPrefix(
+ "annoPrefix").setText("annoText"));
final List<AnnotationElement> annoElementsForSimpleProp = new ArrayList<AnnotationElement>();
annoElementsForSimpleProp.add(new AnnotationElement().setName("propertyAnnoElement").setText("text"));
annoElementsForSimpleProp.add(new AnnotationElement().setName("propertyAnnoElement2"));
- final SimpleProperty simpleProp = new SimpleProperty().setName("EmployeeName").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings()
- .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)).setAnnotationAttributes(annoList2).setAnnotationElements(annoElementsForSimpleProp);
+ final SimpleProperty simpleProp =
+ new SimpleProperty().setName("EmployeeName").setType(EdmSimpleTypeKind.String)
+ .setCustomizableFeedMappings(new CustomizableFeedMappings()
+ .setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)).setAnnotationAttributes(annoList2)
+ .setAnnotationElements(annoElementsForSimpleProp);
properties.add(simpleProp);
final ArrayList<AnnotationAttribute> annoList3 = new ArrayList<AnnotationAttribute>();
- annoList3.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespaceNew").setPrefix("annoPrefix").setText("annoTextNew"));
+ annoList3.add(new AnnotationAttribute().setName("annoName").setNamespace("http://annoNamespaceNew").setPrefix(
+ "annoPrefix").setText("annoTextNew"));
properties.add(new SimpleProperty().setName("ManagerId").setType(EdmSimpleTypeKind.String)
.setMapping(new Mapping().setInternalName("getManager.getId")).setAnnotationAttributes(annoList3));
properties.add(new SimpleProperty().setName("RoomId").setType(EdmSimpleTypeKind.String)
@@ -223,7 +233,8 @@ public class EdmTestProvider extends EdmProvider {
properties.add(new SimpleProperty().setName("Age").setType(EdmSimpleTypeKind.Int16));
properties.add(new SimpleProperty().setName("EntryDate").setType(EdmSimpleTypeKind.DateTime)
.setFacets(new Facets().setNullable(true))
- .setCustomizableFeedMappings(new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_UPDATED)));
+ .setCustomizableFeedMappings(
+ new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_UPDATED)));
properties.add(new SimpleProperty().setName("ImageUrl").setType(EdmSimpleTypeKind.String)
.setMapping(new Mapping().setInternalName("getImageUri")));
final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
@@ -245,7 +256,8 @@ public class EdmTestProvider extends EdmProvider {
properties.add(new SimpleProperty().setName("Id").setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false).setDefaultValue("1")));
properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
+ .setCustomizableFeedMappings(
+ new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
return new EntityType().setName(ENTITY_TYPE_1_BASE.getName())
.setAbstract(true)
.setProperties(properties)
@@ -312,11 +324,13 @@ public class EdmTestProvider extends EdmProvider {
properties.add(new SimpleProperty().setName("Id").setType(EdmSimpleTypeKind.Int32)
.setFacets(new Facets().setNullable(false).setConcurrencyMode(EdmConcurrencyMode.Fixed)));
properties.add(new SimpleProperty().setName("Name").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
+ .setCustomizableFeedMappings(
+ new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_TITLE)));
properties.add(new SimpleProperty().setName("Type").setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false)));
properties.add(new SimpleProperty().setName("ImageUrl").setType(EdmSimpleTypeKind.String)
- .setCustomizableFeedMappings(new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORURI))
+ .setCustomizableFeedMappings(
+ new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORURI))
.setMapping(new Mapping().setInternalName("getImageUri")));
properties.add(new SimpleProperty().setName("Image").setType(EdmSimpleTypeKind.Binary)
.setMapping(new Mapping().setMimeType("getType")));
@@ -367,16 +381,22 @@ public class EdmTestProvider extends EdmProvider {
if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
if (ASSOCIATION_1_1.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_1.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_4).setRole(ROLE_1_4).setMultiplicity(EdmMultiplicity.ONE));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_4).setRole(ROLE_1_4).setMultiplicity(EdmMultiplicity.ONE));
} else if (ASSOCIATION_1_2.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_2.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_2).setRole(ROLE_1_2).setMultiplicity(EdmMultiplicity.ONE));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_2).setRole(ROLE_1_2).setMultiplicity(EdmMultiplicity.ONE));
} else if (ASSOCIATION_1_3.getName().equals(edmFQName.getName())) {
return new Association().setName(ASSOCIATION_1_3.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.ONE));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_1).setRole(ROLE_1_1).setMultiplicity(EdmMultiplicity.MANY))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.ONE));
} else if (ASSOCIATION_1_4.getName().equals(edmFQName.getName())) {
final List<PropertyRef> propertyRefsPrincipal = new ArrayList<PropertyRef>();
propertyRefsPrincipal.add(new PropertyRef().setName("Id"));
@@ -385,10 +405,16 @@ public class EdmTestProvider extends EdmProvider {
propertyRefsDependent.add(new PropertyRef().setName("Id"));
propertyRefsDependent.add(new PropertyRef().setName("Id2"));
return new Association().setName(ASSOCIATION_1_4.getName())
- .setEnd1(new AssociationEnd().setType(ENTITY_TYPE_1_5).setRole(ROLE_1_5).setMultiplicity(EdmMultiplicity.ONE))
- .setEnd2(new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.MANY))
- .setReferentialConstraint(new ReferentialConstraint().setPrincipal(new ReferentialConstraintRole().setRole("BuildingToRoom").setPropertyRefs(propertyRefsPrincipal))
- .setDependent(new ReferentialConstraintRole().setRole("RoomToBuilding").setPropertyRefs(propertyRefsDependent)));
+ .setEnd1(
+ new AssociationEnd().setType(ENTITY_TYPE_1_5).setRole(ROLE_1_5).setMultiplicity(EdmMultiplicity.ONE))
+ .setEnd2(
+ new AssociationEnd().setType(ENTITY_TYPE_1_3).setRole(ROLE_1_3).setMultiplicity(EdmMultiplicity.MANY))
+ .setReferentialConstraint(
+ new ReferentialConstraint().setPrincipal(
+ new ReferentialConstraintRole().setRole("BuildingToRoom").setPropertyRefs(propertyRefsPrincipal))
+ .setDependent(
+ new ReferentialConstraintRole().setRole("RoomToBuilding")
+ .setPropertyRefs(propertyRefsDependent)));
}
}
return null;
@@ -449,12 +475,16 @@ public class EdmTestProvider extends EdmProvider {
} else if (FUNCTION_IMPORT_3.equals(name)) {
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(EdmSimpleTypeKind.String.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.MANY))
+ .setReturnType(
+ new ReturnType().setTypeName(EdmSimpleTypeKind.String.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.MANY))
.setHttpMethod("GET");
} else if (FUNCTION_IMPORT_4.equals(name)) {
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(EdmSimpleTypeKind.Int16.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.ONE))
+ .setReturnType(
+ new ReturnType().setTypeName(EdmSimpleTypeKind.Int16.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.ONE))
.setHttpMethod("GET");
} else if (FUNCTION_IMPORT_5.equals(name)) {
@@ -467,13 +497,17 @@ public class EdmTestProvider extends EdmProvider {
parameters.add(new FunctionImportParameter().setName("Id").setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false)));
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(EdmSimpleTypeKind.Binary.getFullQualifiedName()).setMultiplicity(EdmMultiplicity.ONE))
+ .setReturnType(
+ new ReturnType().setTypeName(EdmSimpleTypeKind.Binary.getFullQualifiedName()).setMultiplicity(
+ EdmMultiplicity.ONE))
.setHttpMethod("GET")
.setParameters(parameters);
} else if (FUNCTION_IMPORT_7.equals(name)) {
return new FunctionImport().setName(name)
- .setReturnType(new ReturnType().setTypeName(new FullQualifiedName(NAMESPACE_1, "Employee")).setMultiplicity(EdmMultiplicity.ZERO_TO_ONE))
+ .setReturnType(
+ new ReturnType().setTypeName(new FullQualifiedName(NAMESPACE_1, "Employee")).setMultiplicity(
+ EdmMultiplicity.ZERO_TO_ONE))
.setEntitySet(ENTITY_SET_1_1)
.setHttpMethod("GET");
@@ -484,7 +518,8 @@ public class EdmTestProvider extends EdmProvider {
}
@Override
- public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association, final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
+ public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association,
+ final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
if (ENTITY_CONTAINER_1.equals(entityContainer)) {
if (ASSOCIATION_1_1.equals(association)) {
return new AssociationSet().setName(ASSOCIATION_1_1.getName())
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
index 10085c0..6d53526 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
@@ -1,35 +1,34 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.mock;
import java.util.ArrayList;
import java.util.List;
-import org.mockito.Mockito;
-
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.uri.PathSegment;
+import org.mockito.Mockito;
/**
* Mocked Entity Data Model, more or less aligned to the Reference Scenario.
- *
+ *
*/
public class MockFacade {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
index 420c7b1..da185b6 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.mock;
@@ -36,7 +36,10 @@ public class SampleClassForInvalidMessageReferences extends ODataMessageExceptio
super(messageReference, errorCode);
}
- public static final MessageReference EXIST = createMessageReference(SampleClassForInvalidMessageReferences.class, "EXIST");
- public static final MessageReference DOES_NOT_EXIST = createMessageReference(SampleClassForInvalidMessageReferences.class, "DOES_NOT_EXIST");
- public static final MessageReference EXITS_BUT_EMPTY = createMessageReference(SampleClassForInvalidMessageReferences.class, "EXITS_BUT_EMPTY");
+ public static final MessageReference EXIST = createMessageReference(SampleClassForInvalidMessageReferences.class,
+ "EXIST");
+ public static final MessageReference DOES_NOT_EXIST = createMessageReference(
+ SampleClassForInvalidMessageReferences.class, "DOES_NOT_EXIST");
+ public static final MessageReference EXITS_BUT_EMPTY = createMessageReference(
+ SampleClassForInvalidMessageReferences.class, "EXITS_BUT_EMPTY");
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
index 92733af..4592ee3 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.mock;
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmException;
/**
* Helper for the entity data model used as technical reference scenario.
- *
+ *
*/
public class TecEdmInfo {
private final Edm edm;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
index 703a068..f32f1d9 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.mock;
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
/**
* Provider for the entity data model used as technical reference scenario
- *
+ *
*/
public class TechnicalScenarioEdmProvider extends EdmProvider {
@@ -113,9 +113,11 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
- navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_1).setToRole(ROLE_2).setRelationship(ASSOCIATION_ET1_ET2));
+ navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_1).setToRole(ROLE_2)
+ .setRelationship(ASSOCIATION_ET1_ET2));
- return new EntityType().setName(ET_KEY_IS_STRING.getName()).setProperties(properties).setNavigationProperties(navigationProperties).setKey(createKey("KeyString"));
+ return new EntityType().setName(ET_KEY_IS_STRING.getName()).setProperties(properties).setNavigationProperties(
+ navigationProperties).setKey(createKey("KeyString"));
} else if (ET_KEY_IS_INTEGER.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
properties.add(new SimpleProperty().setName("KeyInteger")
@@ -123,9 +125,11 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
.setFacets(new Facets().setNullable(false)));
final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
- navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_2).setToRole(ROLE_1).setRelationship(ASSOCIATION_ET1_ET2));
+ navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_2).setToRole(ROLE_1)
+ .setRelationship(ASSOCIATION_ET1_ET2));
- return new EntityType().setName(ET_KEY_IS_INTEGER.getName()).setProperties(properties).setNavigationProperties(navigationProperties).setKey(createKey("KeyInteger"));
+ return new EntityType().setName(ET_KEY_IS_INTEGER.getName()).setProperties(properties).setNavigationProperties(
+ navigationProperties).setKey(createKey("KeyInteger"));
} else if (ET_COMPLEX_KEY.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
@@ -136,7 +140,8 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
.setType(EdmSimpleTypeKind.String)
.setFacets(new Facets().setNullable(false)));
- return new EntityType().setName(ET_COMPLEX_KEY.getName()).setProperties(properties).setKey(createKey("KeyInteger", "KeyString"));
+ return new EntityType().setName(ET_COMPLEX_KEY.getName()).setProperties(properties).setKey(
+ createKey("KeyInteger", "KeyString"));
} else if (ET_ALL_TYPES.getName().equals(edmFQName.getName())) {
final List<Property> properties = new ArrayList<Property>();
properties.add(new SimpleProperty().setName("Boolean").setType(EdmSimpleTypeKind.Boolean));
@@ -221,8 +226,10 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
public Association getAssociation(final FullQualifiedName edmFQName) throws ODataMessageException {
if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
if (ASSOCIATION_ET1_ET2.getName().equals(edmFQName.getName())) {
- final AssociationEnd end1 = new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ROLE_1).setType(ET_KEY_IS_STRING);
- final AssociationEnd end2 = new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ROLE_2).setType(ET_KEY_IS_INTEGER);
+ final AssociationEnd end1 =
+ new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ROLE_1).setType(ET_KEY_IS_STRING);
+ final AssociationEnd end2 =
+ new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ROLE_2).setType(ET_KEY_IS_INTEGER);
return new Association().setName("Association").setEnd1(end1).setEnd2(end2);
}
}
@@ -259,12 +266,14 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
}
@Override
- public FunctionImport getFunctionImport(final String entityContainer, final String name) throws ODataMessageException {
+ public FunctionImport getFunctionImport(final String entityContainer, final String name)
+ throws ODataMessageException {
return null;
}
@Override
- public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association, final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataMessageException {
+ public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association,
+ final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataMessageException {
if (ENTITY_CONTAINER_1.equals(entityContainer)) {
if (ASSOCIATION_ET1_ET2.equals(association)) {
final AssociationSetEnd end1 = new AssociationSetEnd().setRole(ROLE_1).setEntitySet(ES_KEY_IS_STRING);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/afcc636a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
index aa43be4..63073a6 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * 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.testutil.server;