[OLINGO-168] Refactoring
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7c2dac9c Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7c2dac9c Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7c2dac9c Branch: refs/heads/olingo-206-validator Commit: 7c2dac9c22f8785797bd293ef67f995a16ca60b6 Parents: 6a3a4a1 Author: Christian Amend <[email protected]> Authored: Wed Apr 2 09:16:05 2014 +0200 Committer: Christian Amend <[email protected]> Committed: Wed Apr 2 09:18:02 2014 +0200 ---------------------------------------------------------------------- .../json/ServiceDocumentJsonSerializer.java | 4 +- .../xml/MetadataDocumentXmlSerializer.java | 14 +- .../server/core/uri/parser/UriContext.java | 4 +- .../serializer/xml/MetadataDocumentTest.java | 3 +- .../testutil/techprovider/ActionProvider.java | 8 +- .../techprovider/ComplexTypeProvider.java | 8 +- .../testutil/techprovider/PropertyProvider.java | 174 +++++++++---------- .../testutil/techprovider/SchemaProvider.java | 4 +- 8 files changed, 108 insertions(+), 111 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7c2dac9c/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentJsonSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentJsonSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentJsonSerializer.java index 00d853d..827824b 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentJsonSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentJsonSerializer.java @@ -74,8 +74,8 @@ public class ServiceDocumentJsonSerializer { } } - private void writeFunctionImports(final JsonGenerator gen, final Edm edm) throws JsonGenerationException, - IOException { + private void writeFunctionImports(final JsonGenerator gen, final Edm edm) throws JsonGenerationException, + IOException { EdmEntityContainer container = edm.getEntityContainer(null); for (EdmFunctionImport edmFunctionImport : container.getFunctionImports()) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7c2dac9c/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java index 2313a3a..d83ad86 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java @@ -160,7 +160,7 @@ public class MetadataDocumentXmlSerializer { writer.writeEndElement(); } - private void appendTypeDefinitions(XMLStreamWriter writer, List<EdmTypeDefinition> typeDefinitions) + private void appendTypeDefinitions(final XMLStreamWriter writer, final List<EdmTypeDefinition> typeDefinitions) throws XMLStreamException { for (EdmTypeDefinition definition : typeDefinitions) { writer.writeEmptyElement(XML_TYPE_DEFINITION); @@ -251,7 +251,7 @@ public class MetadataDocumentXmlSerializer { } - private void appendNavigationPropertyBindings(final XMLStreamWriter writer, EdmBindingTarget bindingTarget) + private void appendNavigationPropertyBindings(final XMLStreamWriter writer, final EdmBindingTarget bindingTarget) throws XMLStreamException { if (bindingTarget.getNavigationPropertyBindings() != null) { for (EdmNavigationPropertyBinding binding : bindingTarget.getNavigationPropertyBindings()) { @@ -292,7 +292,7 @@ public class MetadataDocumentXmlSerializer { } } - private void appendOperationReturnType(final XMLStreamWriter writer, EdmOperation operation) + private void appendOperationReturnType(final XMLStreamWriter writer, final EdmOperation operation) throws XMLStreamException { EdmReturnType returnType = operation.getReturnType(); if (returnType != null) { @@ -303,7 +303,7 @@ public class MetadataDocumentXmlSerializer { } } - private void appendOperationParameters(final XMLStreamWriter writer, EdmOperation operation) + private void appendOperationParameters(final XMLStreamWriter writer, final EdmOperation operation) throws XMLStreamException { for (String parameterName : operation.getParameterNames()) { EdmParameter parameter = operation.getParameter(parameterName); @@ -329,7 +329,8 @@ public class MetadataDocumentXmlSerializer { } } - private void appendReturnTypeFacets(XMLStreamWriter writer, EdmReturnType returnType) throws XMLStreamException { + private void appendReturnTypeFacets(final XMLStreamWriter writer, final EdmReturnType returnType) + throws XMLStreamException { if (returnType.isNullable() != null) { writer.writeAttribute(XML_NULLABLE, "" + returnType.isNullable()); } @@ -344,7 +345,8 @@ public class MetadataDocumentXmlSerializer { } } - private void appendParameterFacets(XMLStreamWriter writer, EdmParameter parameter) throws XMLStreamException { + private void appendParameterFacets(final XMLStreamWriter writer, final EdmParameter parameter) + throws XMLStreamException { if (parameter.isNullable() != null) { writer.writeAttribute(XML_NULLABLE, "" + parameter.isNullable()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7c2dac9c/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java index ebdcbe3..957721a 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java @@ -50,8 +50,8 @@ public class UriContext { * #visitExpandPathExtension(final * ExpandPathExtensionContext ctx)} to allow nodes * deeper in the expand tree at - * {@link #visitExpandPathExtension( - * org.apache.olingo.server.core.uri.antlr.UriParserParser.ExpandPathExtensionContext ctx)} + * {@link + * #visitExpandPathExtension(org.apache.olingo.server.core.uri.antlr.UriParserParser.ExpandPathExtensionContext ctx)} * appending path * segments to the currently processed {@link ExpandItemImpl}. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7c2dac9c/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java index 88f84ec..9d08914 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java @@ -52,7 +52,6 @@ public class MetadataDocumentTest { ODataSerializer serializer = ODataServer.newInstance().getSerializer(ODataFormat.XML); EdmProviderImpl edm = new EdmProviderImpl(new EdmTechProvider()); InputStream metadata = serializer.metadataDocument(edm); - String metadataString = StringUtils.inputStreamToString(metadata, false); - //System.out.println(metadataString); + StringUtils.inputStreamToString(metadata, false); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7c2dac9c/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ActionProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ActionProvider.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ActionProvider.java index ef3cb19..f1748a7 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ActionProvider.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ActionProvider.java @@ -55,7 +55,7 @@ public class ActionProvider { public static final FullQualifiedName nameUARTETParam = new FullQualifiedName(SchemaProvider.nameSpace, "UARTETParam"); - + public static final FullQualifiedName nameUARTPrimParam = new FullQualifiedName(SchemaProvider.nameSpace, "UARTPrimParam"); public static final FullQualifiedName nameUARTPrimCollParam = new FullQualifiedName(SchemaProvider.nameSpace, @@ -124,7 +124,7 @@ public class ActionProvider { new Action().setName("BAETTwoKeyNavRTETTwoKeyNav") .setParameters(Arrays.asList( new Parameter().setName("ParameterETTwoKeyNav").setType(EntityTypeProvider.nameETTwoKeyNav) - .setNullable(false))) + .setNullable(false))) .setBound(true) .setReturnType( new ReturnType().setType(EntityTypeProvider.nameETTwoKeyNav)) @@ -132,7 +132,7 @@ public class ActionProvider { new Action().setName("BAETTwoKeyNavRTETTwoKeyNav") .setParameters(Arrays.asList( new Parameter().setName("ParameterETKeyNav").setType(EntityTypeProvider.nameETKeyNav) - .setNullable(false))) + .setNullable(false))) .setBound(true) .setReturnType( new ReturnType().setType(EntityTypeProvider.nameETTwoKeyNav)) @@ -167,7 +167,7 @@ public class ActionProvider { new Action().setName("BAETBaseTwoKeyNavRTETBaseTwoKeyNav") .setParameters(Arrays.asList( new Parameter().setName("ParameterETTwoKeyNav").setType(EntityTypeProvider.nameETBaseTwoKeyNav) - .setNullable(false))) + .setNullable(false))) .setBound(true) .setReturnType( new ReturnType().setType(EntityTypeProvider.nameETTwoKeyNav)) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7c2dac9c/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ComplexTypeProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ComplexTypeProvider.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ComplexTypeProvider.java index 2fcbec2..2db6d0e 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ComplexTypeProvider.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/ComplexTypeProvider.java @@ -93,7 +93,7 @@ public class ComplexTypeProvider { } else if (complexTypeName.equals(nameCTCompNav)) { return new ComplexType() .setName("CTCompNav") - .setProperties(Arrays.asList(PropertyProvider.propertyString, + .setProperties(Arrays.asList(PropertyProvider.propertyString, PropertyProvider.propertyComplex_CTNavFiveProp)); } else if (complexTypeName.equals(nameCTMixPrimCollComp)) { @@ -115,11 +115,7 @@ public class ComplexTypeProvider { } else if (complexTypeName.equals(nameCTTwoBase)) { return new ComplexType() .setName("CTTwoBase") - .setBaseType(nameCTBase) - .setProperties(Arrays.asList( - new Property() - .setName("AdditionalPropString2") - .setType(new FullQualifiedName("Edm", "String")))); + .setBaseType(nameCTBase); } else if (complexTypeName.equals(nameCTCompComp)) { return new ComplexType() http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7c2dac9c/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/PropertyProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/PropertyProvider.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/PropertyProvider.java index 6dc2399..2b6e10e 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/PropertyProvider.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/PropertyProvider.java @@ -54,23 +54,23 @@ public class PropertyProvider { .setName("CollPropertyBinary") .setType(nameBinary) .setCollection(true); - + public static final Property collPropertyBinary_ExplicitNullable = new Property() - .setName("CollPropertyBinary") - .setType(nameBinary) - .setNullable(true) - .setCollection(true); + .setName("CollPropertyBinary") + .setType(nameBinary) + .setNullable(true) + .setCollection(true); public static final Property collPropertyBoolean = new Property() .setName("CollPropertyBoolean") .setType(nameBoolean) .setCollection(true); - + public static final Property collPropertyBoolean_ExplicitNullable = new Property() - .setName("CollPropertyBoolean") - .setType(nameBoolean) - .setNullable(true) - .setCollection(true); + .setName("CollPropertyBoolean") + .setType(nameBoolean) + .setNullable(true) + .setCollection(true); public static final Property collPropertyByte = new Property() .setName("CollPropertyByte") @@ -78,109 +78,109 @@ public class PropertyProvider { .setCollection(true); public static final Property collPropertyByte_ExplicitNullable = new Property() - .setName("CollPropertyByte") - .setType(nameByte) - .setNullable(true) - .setCollection(true); - + .setName("CollPropertyByte") + .setType(nameByte) + .setNullable(true) + .setCollection(true); + public static final Property collPropertyDate = new Property() .setName("CollPropertyDate") .setType(nameDate) .setCollection(true); - + public static final Property collPropertyDate_ExplicitNullable = new Property() - .setName("CollPropertyDate") - .setType(nameDate) - .setNullable(true) - .setCollection(true); + .setName("CollPropertyDate") + .setType(nameDate) + .setNullable(true) + .setCollection(true); public static final Property collPropertyDateTimeOffset = new Property() .setName("CollPropertyDateTimeOffset") .setType(nameDateTimeOffset) .setCollection(true); - + public static final Property collPropertyDateTimeOffset_ExplicitNullable = new Property() - .setName("CollPropertyDateTimeOffset") - .setType(nameDateTimeOffset) - .setNullable(true) - .setCollection(true); + .setName("CollPropertyDateTimeOffset") + .setType(nameDateTimeOffset) + .setNullable(true) + .setCollection(true); public static final Property collPropertyDecimal = new Property() .setName("CollPropertyDecimal") .setType(nameDecimal) .setCollection(true); - + public static final Property collPropertyDecimal_ExplicitNullable = new Property() - .setName("CollPropertyDecimal") - .setType(nameDecimal) - .setNullable(true) - .setCollection(true); + .setName("CollPropertyDecimal") + .setType(nameDecimal) + .setNullable(true) + .setCollection(true); public static final Property collPropertyDouble = new Property() .setName("CollPropertyDouble") .setType(nameDouble) .setCollection(true); - + public static final Property collPropertyDouble_ExplicitNullable = new Property() - .setName("CollPropertyDouble") - .setType(nameDouble) - .setNullable(true) - .setCollection(true); + .setName("CollPropertyDouble") + .setType(nameDouble) + .setNullable(true) + .setCollection(true); public static final Property collPropertyDuration = new Property() .setName("CollPropertyDuration") .setType(nameDuration) .setCollection(true); - + public static final Property collPropertyDuration_ExplicitNullable = new Property() - .setName("CollPropertyDuration") - .setType(nameDuration) - .setNullable(true) - .setCollection(true); - + .setName("CollPropertyDuration") + .setType(nameDuration) + .setNullable(true) + .setCollection(true); + public static final Property collPropertyGuid = new Property() .setName("CollPropertyGuid") .setType(nameGuid) .setCollection(true); - + public static final Property collPropertyGuid_ExplicitNullable = new Property() - .setName("CollPropertyGuid") - .setType(nameGuid) - .setNullable(true) - .setCollection(true); - + .setName("CollPropertyGuid") + .setType(nameGuid) + .setNullable(true) + .setCollection(true); + public static final Property collPropertyInt16 = new Property() .setName("CollPropertyInt16") .setType(nameInt16) .setCollection(true); - + public static final Property collPropertyInt16_ExplicitNullable = new Property() - .setName("CollPropertyInt16") - .setType(nameInt16) - .setNullable(true) - .setCollection(true); - + .setName("CollPropertyInt16") + .setType(nameInt16) + .setNullable(true) + .setCollection(true); + public static final Property collPropertyInt32 = new Property() .setName("CollPropertyInt32") .setType(nameInt32) .setCollection(true); - + public static final Property collPropertyInt32_ExplicitNullable = new Property() - .setName("CollPropertyInt32") - .setType(nameInt32) - .setNullable(true) - .setCollection(true); - + .setName("CollPropertyInt32") + .setType(nameInt32) + .setNullable(true) + .setCollection(true); + public static final Property collPropertyInt64 = new Property() .setName("CollPropertyInt64") .setType(nameInt64) .setCollection(true); - + public static final Property collPropertyInt64_ExplicitNullable = new Property() - .setName("CollPropertyInt64") - .setType(nameInt64) - .setNullable(true) - .setCollection(true); + .setName("CollPropertyInt64") + .setType(nameInt64) + .setNullable(true) + .setCollection(true); public static final Property collPropertySByte = new Property() .setName("CollPropertySByte") @@ -188,43 +188,43 @@ public class PropertyProvider { .setCollection(true); public static final Property collPropertySByte_ExplicitNullable = new Property() - .setName("CollPropertySByte") - .setType(nameSByte) - .setNullable(true) - .setCollection(true); - + .setName("CollPropertySByte") + .setType(nameSByte) + .setNullable(true) + .setCollection(true); + public static final Property collPropertySingle = new Property() .setName("CollPropertySingle") .setType(nameSingle) .setCollection(true); - + public static final Property collPropertySingle_ExplicitNullable = new Property() - .setName("CollPropertySingle") - .setType(nameSingle) - .setNullable(true) - .setCollection(true); + .setName("CollPropertySingle") + .setType(nameSingle) + .setNullable(true) + .setCollection(true); public static final Property collPropertyString = new Property() .setName("CollPropertyString") .setType(nameString) .setCollection(true); - + public static final Property collPropertyString_ExplicitNullable = new Property() - .setName("CollPropertyString") - .setType(nameString) - .setNullable(true) - .setCollection(true); + .setName("CollPropertyString") + .setType(nameString) + .setNullable(true) + .setCollection(true); public static final Property collPropertyTimeOfDay = new Property() - .setName("CollPropertyTimeOfDay") - .setType(nameTimeOfDay) - .setCollection(true); - + .setName("CollPropertyTimeOfDay") + .setType(nameTimeOfDay) + .setCollection(true); + public static final Property collPropertyTimeOfDay_ExplicitNullable = new Property() - .setName("CollPropertyTimeOfDay") - .setType(nameTimeOfDay) - .setNullable(true) - .setCollection(true); + .setName("CollPropertyTimeOfDay") + .setType(nameTimeOfDay) + .setNullable(true) + .setCollection(true); public static final Property propertyBinary = new Property() .setName("PropertyBinary") http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7c2dac9c/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java index 81f638d..70d9987 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/testutil/techprovider/SchemaProvider.java @@ -166,11 +166,11 @@ public class SchemaProvider { functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTCTNavFiveProp)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTCollCTNavFiveProp)); - + functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESTwoKeyNavRTStringParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCESKeyNavRTETKeyNavParam)); functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTETTwoKeyNavParam)); - //functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTESTwoKeyNavParam)); + // functions.addAll(prov.getFunctions(FunctionProvider.nameBFCCTPrimCompRTESTwoKeyNavParam)); // EntityContainer EntityContainer container = new EntityContainer();
