Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanings

This commit is contained in:
Francesco Chicchiriccò 2014-05-09 12:46:19 +02:00
parent b497634529
commit 40895b8b2d
30 changed files with 48 additions and 1053 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/EntityContainerFactory.java
View File

@ -31,7 +31,7 @@ import org.apache.olingo.ext.proxy.context.Context;
/**
* Entry point for ODataJClient proxy mode, gives access to entity container instances.
*/
public class EntityContainerFactory {
public final class EntityContainerFactory {
private static final Object MONITOR = new Object();
@ -40,8 +40,7 @@ public class EntityContainerFactory {
private static final Map<String, EntityContainerFactory> FACTORY_PER_SERVICEROOT =
new ConcurrentHashMap<String, EntityContainerFactory>();
private static final Map<Class<?>, Object> ENTITY_CONTAINERS =
new ConcurrentHashMap<Class<?>, Object>();
private static final Map<Class<?>, Object> ENTITY_CONTAINERS = new ConcurrentHashMap<Class<?>, Object>();
private final CommonEdmEnabledODataClient<?> client;
@ -59,6 +58,7 @@ public class EntityContainerFactory {
private static <C extends CommonEdmEnabledODataClient<?>> EntityContainerFactory getInstance(
final C client, final String serviceRoot) {
if (!FACTORY_PER_SERVICEROOT.containsKey(serviceRoot)) {
final EntityContainerFactory instance = new EntityContainerFactory(client, serviceRoot);
FACTORY_PER_SERVICEROOT.put(serviceRoot, instance);
@ -67,11 +67,11 @@ public class EntityContainerFactory {
return FACTORY_PER_SERVICEROOT.get(serviceRoot);
}
public static EntityContainerFactory getV3Instance(final String serviceRoot) {
public static EntityContainerFactory getV3(final String serviceRoot) {
return getInstance(ODataClientFactory.getEdmEnabledV3(serviceRoot), serviceRoot);
}
public static EntityContainerFactory getV4Instance(final String serviceRoot) {
public static EntityContainerFactory getV4(final String serviceRoot) {
return getInstance(ODataClientFactory.getEdmEnabledV4(serviceRoot), serviceRoot);
}
@ -92,9 +92,7 @@ public class EntityContainerFactory {
* @return an initialized concrete implementation of the passed reference
* @throws IllegalStateException if <tt>serviceRoot</tt> was not set
* @throws IllegalArgumentException if the passed reference is not an interface annotated as EntityContainer
* @see com.msopentech.odatajclient.proxy.api.annotations.EntityContainer
*/
@SuppressWarnings("unchecked")
public <T> T getEntityContainer(final Class<T> reference) throws IllegalStateException, IllegalArgumentException {
if (StringUtils.isBlank(serviceRoot)) {
throw new IllegalStateException("serviceRoot was not set");
@ -107,6 +105,6 @@ public class EntityContainerFactory {
EntityContainerInvocationHandler.getInstance(client, reference, this));
ENTITY_CONTAINERS.put(reference, entityContainer);
}
return (T) ENTITY_CONTAINERS.get(reference);
return reference.cast(ENTITY_CONTAINERS.get(reference));
}
}

2
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractContainer.java → ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Container.java
View File

@ -23,7 +23,7 @@ import java.io.Serializable;
/**
* Interface for container operations.
*/
public abstract interface AbstractContainer extends Serializable {
public interface Container extends Serializable {
/**
* Flushes all pending changes to the OData service.

2
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
View File

@ -179,7 +179,7 @@ abstract class AbstractInvocationHandler<C extends CommonEdmEnabledODataClient<?
// 2. IMPORTANT: flush any pending change *before* invoke if this operation is side effecting
if (annotation.type() == OperationType.ACTION) {
new Container(client, containerHandler.getFactory()).flush();
new ContainerImpl(client, containerHandler.getFactory()).flush();
}
// 3. invoke

38
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/Container.java → ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ContainerImpl.java
View File

@ -54,7 +54,7 @@ import org.apache.olingo.commons.api.domain.ODataLinkType;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.commons.api.format.ODataMediaFormat;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
import org.apache.olingo.ext.proxy.api.AbstractContainer;
import org.apache.olingo.ext.proxy.api.Container;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.context.AttachedEntity;
import org.apache.olingo.ext.proxy.context.AttachedEntityStatus;
@ -63,20 +63,20 @@ import org.apache.olingo.ext.proxy.utils.EngineUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class Container implements AbstractContainer {
class ContainerImpl implements Container {
private static final long serialVersionUID = -3320312269235907501L;
/**
* Logger.
*/
private static final Logger LOG = LoggerFactory.getLogger(Container.class);
private static final Logger LOG = LoggerFactory.getLogger(ContainerImpl.class);
private final CommonEdmEnabledODataClient<?> client;
private final EntityContainerFactory factory;
Container(final CommonEdmEnabledODataClient<?> client, final EntityContainerFactory factory) {
ContainerImpl(final CommonEdmEnabledODataClient<?> client, final EntityContainerFactory factory) {
this.client = client;
this.factory = factory;
}
@ -115,9 +115,8 @@ class Container implements AbstractContainer {
throw new IllegalStateException("Operation failed");
}
final Iterator<ODataBatchResponseItem> iter = response.getBody();
if (!items.isEmpty()) {
final Iterator<ODataBatchResponseItem> iter = response.getBody();
if (!iter.hasNext()) {
throw new IllegalStateException("Unexpected operation result");
}
@ -154,8 +153,8 @@ class Container implements AbstractContainer {
}
private void batch(
final EntityTypeInvocationHandler<?> handler,
final CommonODataEntity entity,
final EntityTypeInvocationHandler<?> handler,
final CommonODataEntity entity,
final ODataChangeset changeset) {
switch (EntityContainerFactory.getContext().entityContext().getStatus(handler)) {
@ -264,10 +263,10 @@ class Container implements AbstractContainer {
client.getServiceVersion().compareTo(ODataServiceVersion.V30) <= 0
? ((org.apache.olingo.client.api.v3.EdmEnabledODataClient) client).getCUDRequestFactory().
getEntityUpdateRequest(
uri, org.apache.olingo.client.api.communication.request.cud.v3.UpdateType.PATCH, changes)
uri, org.apache.olingo.client.api.communication.request.cud.v3.UpdateType.PATCH, changes)
: ((org.apache.olingo.client.api.v4.EdmEnabledODataClient) client).getCUDRequestFactory().
getEntityUpdateRequest(
uri, org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes);
uri, org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes);
req.setPrefer(new ODataPreferences(client.getServiceVersion()).returnContent());
@ -396,7 +395,7 @@ class Container implements AbstractContainer {
final URI targetURI = currentStatus == AttachedEntityStatus.NEW
? URI.create("$" + startingPos + "/$value")
: URIUtils.getURI(
factory.getServiceRoot(), handler.getEntity().getEditLink().toASCIIString() + "/$value");
factory.getServiceRoot(), handler.getEntity().getEditLink().toASCIIString() + "/$value");
batchUpdateMediaEntity(handler, targetURI, handler.getStreamChanges(), changeset);
@ -409,8 +408,8 @@ class Container implements AbstractContainer {
for (Map.Entry<String, InputStream> streamedChanges : handler.getStreamedPropertyChanges().entrySet()) {
final URI targetURI = currentStatus == AttachedEntityStatus.NEW
? URI.create("$" + startingPos) : URIUtils.getURI(
factory.getServiceRoot(),
EngineUtils.getEditMediaLink(streamedChanges.getKey(), entity).toASCIIString());
factory.getServiceRoot(),
EngineUtils.getEditMediaLink(streamedChanges.getKey(), entity).toASCIIString());
batchUpdateMediaResource(handler, targetURI, streamedChanges.getValue(), changeset);
@ -423,16 +422,22 @@ class Container implements AbstractContainer {
}
private ODataLink buildNavigationLink(final String name, final URI uri, final ODataLinkType type) {
ODataLink result;
switch (type) {
case ENTITY_NAVIGATION:
return client.getObjectFactory().newEntityNavigationLink(name, uri);
result = client.getObjectFactory().newEntityNavigationLink(name, uri);
break;
case ENTITY_SET_NAVIGATION:
return client.getObjectFactory().newEntitySetNavigationLink(name, uri);
result = client.getObjectFactory().newEntitySetNavigationLink(name, uri);
break;
default:
throw new IllegalArgumentException("Invalid link type " + type.name());
}
return result;
}
private void processDelayedUpdates(
@ -477,8 +482,7 @@ class Container implements AbstractContainer {
? client.getObjectFactory().newEntityNavigationLink(delayedUpdate.getSourceName(), targetURI)
: client.getObjectFactory().newEntitySetNavigationLink(delayedUpdate.getSourceName(), targetURI));
LOG.debug("'{}' from {} to {}", new Object[] {
delayedUpdate.getType().name(), sourceURI, targetURI});
LOG.debug("'{}' from {} to {}", delayedUpdate.getType().name(), sourceURI, targetURI);
}
batchUpdate(delayedUpdate.getSource(), sourceURI, changes, changeset);

13
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java
View File

@ -27,7 +27,7 @@ import org.apache.olingo.ext.proxy.EntityContainerFactory;
import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
import org.apache.olingo.ext.proxy.utils.ClassUtils;
public class EntityContainerInvocationHandler<C extends CommonEdmEnabledODataClient<?>>
public final class EntityContainerInvocationHandler<C extends CommonEdmEnabledODataClient<?>>
extends AbstractInvocationHandler<C> {
private static final long serialVersionUID = 7379006755693410764L;
@ -65,29 +65,28 @@ public class EntityContainerInvocationHandler<C extends CommonEdmEnabledODataCli
this.namespace = ((EntityContainer) annotation).namespace();
}
EntityContainerFactory getFactory() {
protected EntityContainerFactory getFactory() {
return factory;
}
boolean isDefaultEntityContainer() {
protected boolean isDefaultEntityContainer() {
return defaultEC;
}
String getEntityContainerName() {
protected String getEntityContainerName() {
return name;
}
String getSchemaName() {
protected String getSchemaName() {
return namespace;
}
@Override
@SuppressWarnings("unchecked")
public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
if (isSelfMethod(method, args)) {
return invokeSelfMethod(method, args);
} else if ("flush".equals(method.getName()) && ArrayUtils.isEmpty(args)) {
new Container(client, factory).flush();
new ContainerImpl(client, factory).flush();
return ClassUtils.returnVoid();
} else if ("operations".equals(method.getName()) && ArrayUtils.isEmpty(args)) {
final Class<?> returnType = method.getReturnType();

3
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ClassUtils.java
View File

@ -73,10 +73,9 @@ public final class ClassUtils {
return result;
}
@SuppressWarnings("unchecked")
public static <ANN extends Annotation> ANN getAnnotation(final Class<ANN> reference, final AccessibleObject obj) {
final Annotation ann = obj.getAnnotation(reference);
return ann == null ? null : (ANN) ann;
return ann == null ? null : reference.cast(ann);
}
public static Class<?> getCompoundKeyRef(final Class<?> entityTypeRef) {

7
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java
View File

@ -132,6 +132,7 @@ public final class EngineUtils {
final FullQualifiedName entity,
final String property,
final Object obj) {
final EdmType edmType = client.getCachedEdm().getEntityType(entity).getProperty(property).getType();
final EdmTypeInfo type = new EdmTypeInfo.Builder().
setEdm(client.getCachedEdm()).setTypeExpression(edmType.getFullQualifiedName().toString()).build();
@ -144,6 +145,7 @@ public final class EngineUtils {
final FullQualifiedName complex,
final String property,
final Object obj) {
final EdmType edmType = client.getCachedEdm().getComplexType(complex).getProperty(property).getType();
final EdmTypeInfo type = new EdmTypeInfo.Builder().
setEdm(client.getCachedEdm()).setTypeExpression(edmType.getFullQualifiedName().toString()).build();
@ -153,7 +155,8 @@ public final class EngineUtils {
private static CommonODataProperty getODataProperty(
final CommonEdmEnabledODataClient<?> client, final String name, final EdmTypeInfo type, final Object obj) {
final CommonODataProperty oprop;
CommonODataProperty oprop;
try {
if (type == null || obj == null) {
@ -219,7 +222,6 @@ public final class EngineUtils {
return obj;
}
@SuppressWarnings("unchecked")
private static void setPropertyValue(final Object bean, final Method getter, final Object value)
throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
@ -259,6 +261,7 @@ public final class EngineUtils {
final Object bean,
final Class<? extends Annotation> getterAnn,
final Iterator<? extends CommonODataProperty> propItor) {
if (bean != null) {
populate(metadata, bean, bean.getClass(), getterAnn, propItor);
}

2
ext/pojogen-maven-plugin/pom.xml
View File

@ -85,7 +85,7 @@
<artifactId>maven-plugin-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<goalPrefix>odatajclient</goalPrefix>
<goalPrefix>pojogen</goalPrefix>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
<executions>

92
ext/pojogen-maven-plugin/src/it/actionOverloadingService/pom.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-maven-plugin</artifactId>
<version>@project.version@</version>
<description>A simple IT verifying the basic use case.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>@velocity.version@</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-proxy</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<serviceRootURL>@serviceRootURL@/ActionOverloadingService.svc</serviceRootURL>
<basePackage>org.apache.olingo.ext.proxy.actionoverloadingservice</basePackage>
</configuration>
<id>pojosV3</id>
<phase>generate-sources</phase>
<goals>
<goal>pojosV3</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

20
ext/pojogen-maven-plugin/src/it/actionOverloadingService/verify.groovy
View File

@ -1,20 +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.
*/
File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
assert basepkg.isDirectory() && basepkg.listFiles().length>0;

92
ext/pojogen-maven-plugin/src/it/defaultService/pom.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-maven-plugin</artifactId>
<version>@project.version@</version>
<description>A simple IT verifying the basic use case.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>@velocity.version@</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-proxy</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<serviceRootURL>@serviceRootURL@/DefaultService.svc</serviceRootURL>
<basePackage>org.apache.olingo.ext.proxy.defaultservice</basePackage>
</configuration>
<id>pojosV3</id>
<phase>generate-sources</phase>
<goals>
<goal>pojosV3</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

20
ext/pojogen-maven-plugin/src/it/defaultService/verify.groovy
View File

@ -1,20 +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.
*/
File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
assert basepkg.isDirectory() && basepkg.listFiles().length>0;

92
ext/pojogen-maven-plugin/src/it/keyAsSegmentService/pom.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-maven-plugin</artifactId>
<version>@project.version@</version>
<description>A simple IT verifying the basic use case.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>@velocity.version@</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-proxy</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<serviceRootURL>@serviceRootURL@/KeyAsSegmentService.svc</serviceRootURL>
<basePackage>org.apache.olingo.ext.proxy.keyassegmentservice</basePackage>
</configuration>
<id>pojosV3</id>
<phase>generate-sources</phase>
<goals>
<goal>pojosV3</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

20
ext/pojogen-maven-plugin/src/it/keyAsSegmentService/verify.groovy
View File

@ -1,20 +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.
*/
File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
assert basepkg.isDirectory() && basepkg.listFiles().length>0;

92
ext/pojogen-maven-plugin/src/it/northwind/pom.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-maven-plugin</artifactId>
<version>@project.version@</version>
<description>A simple IT verifying the basic use case.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>@velocity.version@</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-proxy</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<serviceRootURL>http://services.odata.org/v3/(S(g00nkir0ssikgdmz3maw5l1x))/Northwind/Northwind.svc</serviceRootURL>
<basePackage>org.apache.olingo.ext.proxy.northwind</basePackage>
</configuration>
<id>pojosV3</id>
<phase>generate-sources</phase>
<goals>
<goal>pojosV3</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

20
ext/pojogen-maven-plugin/src/it/northwind/verify.groovy
View File

@ -1,20 +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.
*/
File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
assert basepkg.isDirectory() && basepkg.listFiles().length>0;

92
ext/pojogen-maven-plugin/src/it/odataWriterDefaultService/pom.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-maven-plugin</artifactId>
<version>@project.version@</version>
<description>A simple IT verifying the basic use case.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>@velocity.version@</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-proxy</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<serviceRootURL>@serviceRootURL@/ODataWriterDefaultService.svc</serviceRootURL>
<basePackage>org.apache.olingo.ext.proxy.odatawriterdefaultservice</basePackage>
</configuration>
<id>pojosV3</id>
<phase>generate-sources</phase>
<goals>
<goal>pojosV3</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

20
ext/pojogen-maven-plugin/src/it/odataWriterDefaultService/verify.groovy
View File

@ -1,20 +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.
*/
File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
assert basepkg.isDirectory() && basepkg.listFiles().length>0;

92
ext/pojogen-maven-plugin/src/it/openTypeService/pom.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-maven-plugin</artifactId>
<version>@project.version@</version>
<description>A simple IT verifying the basic use case.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>@velocity.version@</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-proxy</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<serviceRootURL>@serviceRootURL@/OpenTypeService.svc</serviceRootURL>
<basePackage>org.apache.olingo.ext.proxy.opentypeservice</basePackage>
</configuration>
<id>pojosV3</id>
<phase>generate-sources</phase>
<goals>
<goal>pojosV3</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

20
ext/pojogen-maven-plugin/src/it/openTypeService/verify.groovy
View File

@ -1,20 +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.
*/
File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
assert basepkg.isDirectory() && basepkg.listFiles().length>0;

92
ext/pojogen-maven-plugin/src/it/primitiveKeysService/pom.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-maven-plugin</artifactId>
<version>@project.version@</version>
<description>A simple IT verifying the basic use case.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>@velocity.version@</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-proxy</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<serviceRootURL>@serviceRootURL@/PrimitiveKeys.svc</serviceRootURL>
<basePackage>org.apache.olingo.ext.proxy.primitivekeysservice</basePackage>
</configuration>
<id>pojosV3</id>
<phase>generate-sources</phase>
<goals>
<goal>pojosV3</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

20
ext/pojogen-maven-plugin/src/it/primitiveKeysService/verify.groovy
View File

@ -1,20 +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.
*/
File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
assert basepkg.isDirectory() && basepkg.listFiles().length>0;

92
ext/pojogen-maven-plugin/src/it/staticServiceV3/pom.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-maven-plugin</artifactId>
<version>@project.version@</version>
<description>A simple IT verifying the basic use case.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>@velocity.version@</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-proxy</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<serviceRootURL>http://localhost:9080/StaticService/V3/Static.svc</serviceRootURL>
<basePackage>org.apache.olingo.ext.proxy.staticservice</basePackage>
</configuration>
<id>pojosV3</id>
<phase>generate-sources</phase>
<goals>
<goal>pojosV3</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

20
ext/pojogen-maven-plugin/src/it/staticServiceV3/verify.groovy
View File

@ -1,20 +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.
*/
File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
assert basepkg.isDirectory() && basepkg.listFiles().length>0;

92
ext/pojogen-maven-plugin/src/it/staticServiceV4/pom.xml
View File

@ -1,92 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-maven-plugin</artifactId>
<version>@project.version@</version>
<description>A simple IT verifying the basic use case.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>@velocity.version@</version>
</dependency>
<dependency>
<groupId>org.apache.olingo.ext</groupId>
<artifactId>odatajclient-proxy</artifactId>
<version>@project.version@</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>@project.groupId@</groupId>
<artifactId>@project.artifactId@</artifactId>
<version>@project.version@</version>
<executions>
<execution>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
<serviceRootURL>http://localhost:9080/StaticService/V4/Static.svc</serviceRootURL>
<basePackage>org.apache.olingo.ext.proxy.staticservice</basePackage>
</configuration>
<id>pojosV3</id>
<phase>generate-sources</phase>
<goals>
<goal>pojosV4</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

20
ext/pojogen-maven-plugin/src/it/staticServiceV4/verify.groovy
View File

@ -1,20 +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.
*/
File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
assert basepkg.isDirectory() && basepkg.listFiles().length>0;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTest.java
View File

@ -85,7 +85,7 @@ public abstract class AbstractTest {
testLargeModelServiceRootURL = "http://localhost:9080/stub/StaticService/V30/Static.svc/large";
testAuthServiceRootURL = "http://localhost:9080/stub/DefaultService.svc";
containerFactory = EntityContainerFactory.getV3Instance(testStaticServiceRootURL);
containerFactory = EntityContainerFactory.getV3(testStaticServiceRootURL);
container = containerFactory.getEntityContainer(DefaultContainer.class);
assertNotNull(container);
}

4
fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
View File

@ -23,7 +23,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Namespace;
import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.ext.proxy.api.AbstractContainer;
import org.apache.olingo.ext.proxy.api.Container;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
@ -49,7 +49,7 @@ import javax.xml.datatype.Duration;
@EntityContainer(name = "DefaultContainer",
namespace = "Microsoft.Test.OData.Services.AstoriaDefaultService",
isDefaultEntityContainer = true)
public interface DefaultContainer extends AbstractContainer {
public interface DefaultContainer extends Container {
Customer getCustomer();

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTest.java
View File

@ -66,7 +66,7 @@ public abstract class AbstractTest {
testLargeModelServiceRootURL = "http://localhost:9080/stub/StaticService/V40/Static.svc/large";
testAuthServiceRootURL = "http://localhost:9080/stub/DefaultService.svc";
containerFactory = EntityContainerFactory.getV4Instance(testStaticServiceRootURL);
containerFactory = EntityContainerFactory.getV4(testStaticServiceRootURL);
container = containerFactory.getEntityContainer(InMemoryEntities.class);
assertNotNull(container);
}

4
fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
View File

@ -23,7 +23,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Namespace;
import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.ext.proxy.api.AbstractContainer;
import org.apache.olingo.ext.proxy.api.Container;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
@ -49,7 +49,7 @@ import javax.xml.datatype.Duration;
@EntityContainer(name = "InMemoryEntities",
namespace = "Microsoft.Test.OData.Services.ODataWCFService",
isDefaultEntityContainer = true)
public interface InMemoryEntities extends AbstractContainer {
public interface InMemoryEntities extends Container {
Accounts getAccounts();