http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/ConstantAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/ConstantAnnotationExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/ConstantAnnotationExpression.java index 72889e5..cbd592a 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/ConstantAnnotationExpression.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/ConstantAnnotationExpression.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/DynamicAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/DynamicAnnotationExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/DynamicAnnotationExpression.java index 83ff1cd..e10afc0 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/DynamicAnnotationExpression.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/DynamicAnnotationExpression.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ @@ -61,9 +61,9 @@ public interface DynamicAnnotationExpression extends AnnotationExpression { LabeledElementReference asLabeledElementReference(); boolean isNull(); - + Null asNull(); - + boolean isNavigationPropertyPath(); NavigationPropertyPath asNavigationPropertyPath(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java index e035efe..833d1db 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/If.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java index c66374c..369181c 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/IsOf.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java index f2c5eaa..6d8dc9b 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElement.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElementReference.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElementReference.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElementReference.java index 1772921..4a8744b 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElementReference.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/LabeledElementReference.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/NavigationPropertyPath.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/NavigationPropertyPath.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/NavigationPropertyPath.java index 8538f53..647399d 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/NavigationPropertyPath.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/NavigationPropertyPath.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Not.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Not.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Not.java index 1acdede..e5948e9 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Not.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Not.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java index a986fff..27230c7 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Null.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ @@ -21,5 +21,5 @@ package org.apache.olingo.commons.api.edm.provider.annotation; import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; public interface Null extends DynamicAnnotationExpression, CsdlAnnotatable { -//No additional methods needed for now. + // No additional methods needed for now. } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Path.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Path.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Path.java index 7edd73e..85c6518 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Path.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Path.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyPath.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyPath.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyPath.java index a7d26d2..9c2e4f2 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyPath.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyPath.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java index d33ed9a..08c07b3 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/PropertyValue.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java index 10f2352..6644e71 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/Record.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/TwoParamsOpDynamicAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/TwoParamsOpDynamicAnnotationExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/TwoParamsOpDynamicAnnotationExpression.java index c07c9a3..f11ccc6 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/TwoParamsOpDynamicAnnotationExpression.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/TwoParamsOpDynamicAnnotationExpression.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ @@ -43,7 +43,7 @@ public interface TwoParamsOpDynamicAnnotationExpression extends DynamicAnnotatio } Type getType(); - + DynamicAnnotationExpression getLeftExpression(); DynamicAnnotationExpression getRightExpression(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/UrlRef.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/UrlRef.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/UrlRef.java index 0d82502..083c9d4 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/UrlRef.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/annotation/UrlRef.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/package-info.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/package-info.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/package-info.java index abe2a3c..0da3348 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/package-info.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/package-info.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java index 59eaa5d..734e007 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/AcceptType.java @@ -6,9 +6,9 @@ * 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 @@ -27,7 +27,7 @@ import java.util.TreeMap; /** * Internally used {@link AcceptType} for OData library. - * + * * See RFC 7231, chapter 5.3.2: * <pre> * Accept = #( media-range [ accept-params ] ) @@ -40,7 +40,7 @@ import java.util.TreeMap; * weight = OWS ";" OWS "q=" qvalue * qvalue = ( "0" [ "." 0*3DIGIT ] ) / ( "1" [ "." 0*3("0") ] ) * </pre> - * + * * Once created an {@link AcceptType} is <b>IMMUTABLE</b>. */ public class AcceptType { @@ -220,27 +220,27 @@ public class AcceptType { * as defined in RFC 7231, chapters 3.1.1.1, 5.3.1, and 5.3.2. * @param toSort list which is sorted and hence re-arranged */ - private static void sort(List<AcceptType> toSort) { + private static void sort(final List<AcceptType> toSort) { Collections.sort(toSort, new Comparator<AcceptType>() { - @Override - public int compare(final AcceptType a1, final AcceptType a2) { - int compare = a2.getQuality().compareTo(a1.getQuality()); - if (compare != 0) { - return compare; - } - compare = (a1.getType().equals(TypeUtil.MEDIA_TYPE_WILDCARD) ? 1 : 0) - - (a2.getType().equals(TypeUtil.MEDIA_TYPE_WILDCARD) ? 1 : 0); - if (compare != 0) { - return compare; - } - compare = (a1.getSubtype().equals(TypeUtil.MEDIA_TYPE_WILDCARD) ? 1 : 0) - - (a2.getSubtype().equals(TypeUtil.MEDIA_TYPE_WILDCARD) ? 1 : 0); - if (compare != 0) { - return compare; - } - return a2.getParameters().size() - a1.getParameters().size(); - } - }); + @Override + public int compare(final AcceptType a1, final AcceptType a2) { + int compare = a2.getQuality().compareTo(a1.getQuality()); + if (compare != 0) { + return compare; + } + compare = (a1.getType().equals(TypeUtil.MEDIA_TYPE_WILDCARD) ? 1 : 0) + - (a2.getType().equals(TypeUtil.MEDIA_TYPE_WILDCARD) ? 1 : 0); + if (compare != 0) { + return compare; + } + compare = (a1.getSubtype().equals(TypeUtil.MEDIA_TYPE_WILDCARD) ? 1 : 0) + - (a2.getSubtype().equals(TypeUtil.MEDIA_TYPE_WILDCARD) ? 1 : 0); + if (compare != 0) { + return compare; + } + return a2.getParameters().size() - a1.getParameters().size(); + } + }); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java index 23e94c8..4e2eb04 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java @@ -1,18 +1,18 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * 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 - * + * 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 + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ @@ -199,7 +199,7 @@ public final class ContentType { } } - private static void parse(final String format, List<String> typeSubtype, Map<String, String> parameters) { + private static void parse(final String format, final List<String> typeSubtype, final Map<String, String> parameters) { final String[] typesAndParameters = format.split(TypeUtil.PARAMETER_SEPARATOR, 2); final String types = typesAndParameters[0]; final String params = (typesAndParameters.length > 1 ? typesAndParameters[1] : null); @@ -217,11 +217,11 @@ public final class ContentType { } } else { throw new IllegalArgumentException( - "Too many '" + TypeUtil.TYPE_SUBTYPE_SEPARATOR + "' in format '" + format + "'."); + "Too many '" + TypeUtil.TYPE_SUBTYPE_SEPARATOR + "' in format '" + format + "'."); } } else { throw new IllegalArgumentException("No separator '" + TypeUtil.TYPE_SUBTYPE_SEPARATOR - + "' was found in format '" + format + "'."); + + "' was found in format '" + format + "'."); } TypeUtil.parseParameters(params, parameters); @@ -276,7 +276,7 @@ public final class ContentType { while (entries.hasNext()) { final Entry<String, String> e = entries.next(); final Entry<String, String> oe = otherEntries.next(); - if (!areEqual(e.getKey(), oe.getKey())) { + if (!areEqual(e.getKey(), oe.getKey())) { return false; } if (!areEqual(e.getValue(), oe.getValue())) { @@ -325,7 +325,7 @@ public final class ContentType { for (String key : parameters.keySet()) { sb.append(TypeUtil.PARAMETER_SEPARATOR).append(key) - .append(TypeUtil.PARAMETER_KEY_VALUE_SEPARATOR).append(parameters.get(key)); + .append(TypeUtil.PARAMETER_KEY_VALUE_SEPARATOR).append(parameters.get(key)); } return sb.toString(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java index 52e4bec..2114942 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java @@ -6,9 +6,9 @@ * 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 @@ -18,7 +18,6 @@ */ package org.apache.olingo.commons.api.format; - /** * Available formats to be used in various contexts. */ @@ -74,7 +73,7 @@ public enum ODataFormat { /** * Gets OData format from a content type. - * + * * @param contentType content type * @return OData format. */ @@ -91,11 +90,11 @@ public enum ODataFormat { } else if (contentType.isCompatible(ContentType.APPLICATION_JSON)) { String jsonVariant = contentType.getParameters().get("odata.metadata"); if (jsonVariant != null) { - if("none".equals(jsonVariant)){ + if ("none".equals(jsonVariant)) { return JSON_NO_METADATA; - }else if("minimal".equals(jsonVariant)){ + } else if ("minimal".equals(jsonVariant)) { return ODataFormat.JSON; - }else if("full".equals(jsonVariant)){ + } else if ("full".equals(jsonVariant)) { return ODataFormat.JSON_FULL_METADATA; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/TypeUtil.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/TypeUtil.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/TypeUtil.java index 004eaac..03fd078 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/TypeUtil.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/TypeUtil.java @@ -6,9 +6,9 @@ * 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 @@ -43,11 +43,11 @@ class TypeUtil { * parameter might be significant to the processing of a media-type, * depending on its definition within the media type registry. * </p> - * + * * @param parameters * @param parameterMap */ - protected static void parseParameters(final String parameters, Map<String, String> parameterMap) { + protected static void parseParameters(final String parameters, final Map<String, String> parameterMap) { if (parameters != null) { for (String parameter : parameters.split(TypeUtil.PARAMETER_SEPARATOR)) { final String[] keyValue = parseParameter(parameter); @@ -64,7 +64,7 @@ class TypeUtil { if (keyValue.length != 2 || keyValue[0].isEmpty()) { throw new IllegalArgumentException( "Parameter '" + parameter + "' must have exactly one '" + TypeUtil.PARAMETER_KEY_VALUE_SEPARATOR + - "' that separates the name and the value."); + "' that separates the name and the value."); } keyValue[0] = keyValue[0].toLowerCase(Locale.ENGLISH); if (keyValue[0].indexOf(WHITESPACE_CHAR) >= 0) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpContentType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpContentType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpContentType.java index 6bb1081..87612ea 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpContentType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpContentType.java @@ -6,9 +6,9 @@ * 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 @@ -21,7 +21,7 @@ package org.apache.olingo.commons.api.http; /** * Constants for <code>Http Content Type</code> definitions as specified in * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html";>RFC 2616 Section 14</a>. - * + * */ public interface HttpContentType { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java index 7fb6827..ab284b1 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpHeader.java @@ -6,9 +6,9 @@ * 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 @@ -20,8 +20,8 @@ package org.apache.olingo.commons.api.http; /** * HTTP header constants - * - * + * + * */ public interface HttpHeader { @@ -169,5 +169,5 @@ public interface HttpHeader { * {@link <a href="http://docs.oasis-open.org/odata/odata/v4.0/errata01/os/complete/part1-protocol/odata-v4.0-errata01-os-part1-protocol-complete.html#_Toc399426728";> OData Version 4.0 Part 1: Protocol Plus Errata 01</a>} */ public static final String PREFER = "Prefer"; - //CHECKSTYLE:ON + // CHECKSTYLE:ON } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java index 149c6c1..bccefd2 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpStatusCode.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpStatusCode.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpStatusCode.java index 00e2200..0d7784b 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpStatusCode.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpStatusCode.java @@ -6,9 +6,9 @@ * 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 @@ -21,10 +21,9 @@ package org.apache.olingo.commons.api.http; /** * HTTP status codes as defined in RFC2616-sec10 * and additional status codes as defined in RFC6585 - * + * */ public enum HttpStatusCode { - OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"), NO_CONTENT(204, "No Content"), RESET_CONTENT(205, "Reset Content"), PARTIAL_CONTENT(206, "Partial Content"), @@ -32,19 +31,18 @@ public enum HttpStatusCode { "Not Modified"), USE_PROXY(305, "Use Proxy"), TEMPORARY_REDIRECT(307, "Temporary Redirect"), BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401, "Unauthorized"), PAYMENT_REQUIRED(402, "Payment Required"), - FORBIDDEN( - 403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), NOT_ACCEPTABLE( - 406, "Not Acceptable"), PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"), REQUEST_TIMEOUT(408, - "Request Timeout"), CONFLICT(409, "Conflict"), GONE(410, "Gone"), LENGTH_REQUIRED(411, "Length Required"), - PRECONDITION_FAILED(412, "Precondition Failed"), REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"), - REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"), UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"), + FORBIDDEN(403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), + NOT_ACCEPTABLE(406, "Not Acceptable"), PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"), + REQUEST_TIMEOUT(408, "Request Timeout"), CONFLICT(409, "Conflict"), GONE(410, "Gone"), + LENGTH_REQUIRED(411, "Length Required"), PRECONDITION_FAILED(412, "Precondition Failed"), + REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"), REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"), + UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"), REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"), EXPECTATION_FAILED(417, "Expectation Failed"), PRECONDITION_REQUIRED(428, "Precondition Required"), INTERNAL_SERVER_ERROR(500, "Internal Server Error"), NOT_IMPLEMENTED(501, "Not Implemented"), BAD_GATEWAY(502, "Bad Gateway"), SERVICE_UNAVAILABLE(503, "Service Unavailable"), GATEWAY_TIMEOUT(504, "Gateway Timeout"), HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version Not Supported"); - private final int code; private final String info; @@ -55,7 +53,7 @@ public enum HttpStatusCode { /** * Convert a numerical status code into the corresponding status enum object. - * + * * @param statusCode the numerical status code * @return the matching status enum object or null if no matching enum is defined */ @@ -70,7 +68,7 @@ public enum HttpStatusCode { /** * Get the associated status code. - * + * * @return the status code. */ public int getStatusCode() { @@ -79,7 +77,7 @@ public enum HttpStatusCode { /** * Get the status code info. - * + * * @return the status code info */ public String getInfo() { @@ -88,7 +86,7 @@ public enum HttpStatusCode { /** * Get the status code info. - * + * * @return the status code info */ @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java index 21bcbe5..d288cf9 100755 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java @@ -6,9 +6,9 @@ * 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 @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.api.serialization; +import java.io.InputStream; + +import org.apache.olingo.commons.api.ODataError; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; -import org.apache.olingo.commons.api.ODataError; - -import java.io.InputStream; /** * Interface for de-serialization. @@ -33,7 +33,7 @@ public interface ODataDeserializer { /** * Gets an entity set object from the given InputStream. - * + * * @param input stream to be de-serialized. * @return {@link EntityCollection} instance. */ @@ -41,7 +41,7 @@ public interface ODataDeserializer { /** * Gets an entity object from the given InputStream. - * + * * @param input stream to be de-serialized. * @return {@link Entity} instance. */ @@ -49,7 +49,7 @@ public interface ODataDeserializer { /** * Gets a property object from the given InputStream. - * + * * @param input stream to be de-serialized. * @return Property instance. */ @@ -57,7 +57,7 @@ public interface ODataDeserializer { /** * Gets the ODataError object represented by the given InputStream. - * + * * @param input stream to be parsed and de-serialized. * @return parsed ODataError object represented by the given InputStream */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializerException.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializerException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializerException.java index 0e70c41..e5d7df6 100755 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializerException.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializerException.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializer.java index 9a72bbb..0c0f795 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializer.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializer.java @@ -6,9 +6,9 @@ * 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 @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.api.serialization; -import org.apache.olingo.commons.api.data.ResWrap; - import java.io.Writer; +import org.apache.olingo.commons.api.data.ResWrap; + /** * Interface for serialization. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializerException.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializerException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializerException.java index 3056272..797c40a 100755 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializerException.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializerException.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/AcceptTypeTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/AcceptTypeTest.java b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/AcceptTypeTest.java index 72c830d..a6248f3 100644 --- a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/AcceptTypeTest.java +++ b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/AcceptTypeTest.java @@ -6,9 +6,9 @@ * 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 @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.api.format; -import org.junit.Test; - -import java.util.List; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.util.List; + +import org.junit.Test; + public class AcceptTypeTest { @Test @@ -100,7 +100,7 @@ public class AcceptTypeTest { } @Test - public void testWithQParameter () { + public void testWithQParameter() { List<AcceptType> atl = AcceptType.create("application/json;q=0.2"); assertEquals(1, atl.size()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/ContentTypeTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/ContentTypeTest.java b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/ContentTypeTest.java index feae0f7..8a7c642 100644 --- a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/ContentTypeTest.java +++ b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/ContentTypeTest.java @@ -6,9 +6,9 @@ * 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 @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.api.format; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import org.junit.Test; + public class ContentTypeTest { @Test http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Decoder.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Decoder.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Decoder.java index e7f6656..f8e885e 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Decoder.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Decoder.java @@ -6,9 +6,9 @@ * 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 @@ -23,7 +23,7 @@ import java.io.UnsupportedEncodingException; /** * Decodes a Java String containing a percent-encoded UTF-8 String value * into a Java String (in its internal UTF-16 encoding). - * + * */ public class Decoder { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Encoder.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Encoder.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Encoder.java index 99ea86a..edbf9ef 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Encoder.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/Encoder.java @@ -6,9 +6,9 @@ * 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 @@ -25,7 +25,7 @@ import java.io.UnsupportedEncodingException; * percent-encoded UTF-8 representation according to * <a href="http://www.ietf.org/rfc/rfc3986.txt";>RFC 3986</a> * (with consideration of its predecessor RFC 2396). - * + * */ public class Encoder { @@ -53,22 +53,22 @@ public class Encoder { // RFC 3986 says: "For consistency, URI producers and normalizers should // use uppercase hexadecimal digits for all percent-encodings." private final static String[] hex = { "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0A", - "%0B", "%0C", "%0D", "%0E", "%0F", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", "%18", "%19", "%1A", - "%1B", "%1C", "%1D", "%1E", "%1F", "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", "%28", "%29", "%2A", - "%2B", "%2C", "%2D", "%2E", "%2F", "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37", "%38", "%39", "%3A", - "%3B", "%3C", "%3D", "%3E", "%3F", "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47", "%48", "%49", "%4A", - "%4B", "%4C", "%4D", "%4E", "%4F", "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57", "%58", "%59", "%5A", - "%5B", "%5C", "%5D", "%5E", "%5F", "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67", "%68", "%69", "%6A", - "%6B", "%6C", "%6D", "%6E", "%6F", "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77", "%78", "%79", "%7A", - "%7B", "%7C", "%7D", "%7E", "%7F", "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87", "%88", - "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F", "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", - "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F", "%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7", "%A8", - "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF", "%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7", "%B8", - "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF", "%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7", "%C8", - "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF", "%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7", "%D8", - "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF", "%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7", "%E8", - "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF", "%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7", "%F8", - "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF" }; + "%0B", "%0C", "%0D", "%0E", "%0F", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", "%18", "%19", "%1A", + "%1B", "%1C", "%1D", "%1E", "%1F", "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", "%28", "%29", "%2A", + "%2B", "%2C", "%2D", "%2E", "%2F", "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37", "%38", "%39", "%3A", + "%3B", "%3C", "%3D", "%3E", "%3F", "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47", "%48", "%49", "%4A", + "%4B", "%4C", "%4D", "%4E", "%4F", "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57", "%58", "%59", "%5A", + "%5B", "%5C", "%5D", "%5E", "%5F", "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67", "%68", "%69", "%6A", + "%6B", "%6C", "%6D", "%6E", "%6F", "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77", "%78", "%79", "%7A", + "%7B", "%7C", "%7D", "%7E", "%7F", "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87", "%88", + "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F", "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", + "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F", "%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7", "%A8", + "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF", "%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7", "%B8", + "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF", "%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7", "%C8", + "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF", "%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7", "%D8", + "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF", "%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7", "%E8", + "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF", "%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7", "%F8", + "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF" }; private static final Encoder encoder = new Encoder(ODATA_UNENCODED); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdm.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdm.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdm.java index 8880c8a..5bc5810 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdm.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdm.java @@ -18,6 +18,12 @@ */ package org.apache.olingo.commons.core.edm; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -32,12 +38,6 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public abstract class AbstractEdm implements Edm { protected Map<String, EdmSchema> schemas; @@ -47,34 +47,34 @@ public abstract class AbstractEdm implements Edm { private final Map<FullQualifiedName, EdmEntityContainer> entityContainers = Collections.synchronizedMap(new HashMap<FullQualifiedName, EdmEntityContainer>()); - private final Map<FullQualifiedName, EdmEnumType> enumTypes = + private final Map<FullQualifiedName, EdmEnumType> enumTypes = Collections.synchronizedMap(new HashMap<FullQualifiedName, EdmEnumType>()); private final Map<FullQualifiedName, EdmTypeDefinition> typeDefinitions = Collections.synchronizedMap(new HashMap<FullQualifiedName, EdmTypeDefinition>()); - private final Map<FullQualifiedName, EdmEntityType> entityTypes = + private final Map<FullQualifiedName, EdmEntityType> entityTypes = Collections.synchronizedMap(new HashMap<FullQualifiedName, EdmEntityType>()); - private final Map<FullQualifiedName, EdmComplexType> complexTypes = + private final Map<FullQualifiedName, EdmComplexType> complexTypes = Collections.synchronizedMap(new HashMap<FullQualifiedName, EdmComplexType>()); - private final Map<FullQualifiedName, EdmAction> unboundActions = + private final Map<FullQualifiedName, EdmAction> unboundActions = Collections.synchronizedMap(new HashMap<FullQualifiedName, EdmAction>()); private final Map<FullQualifiedName, List<EdmFunction>> unboundFunctionsByName = Collections.synchronizedMap(new HashMap<FullQualifiedName, List<EdmFunction>>()); - private final Map<FunctionMapKey, EdmFunction> unboundFunctionsByKey = + private final Map<FunctionMapKey, EdmFunction> unboundFunctionsByKey = Collections.synchronizedMap(new HashMap<FunctionMapKey, EdmFunction>()); - private final Map<ActionMapKey, EdmAction> boundActions = + private final Map<ActionMapKey, EdmAction> boundActions = Collections.synchronizedMap(new HashMap<ActionMapKey, EdmAction>()); - private final Map<FunctionMapKey, EdmFunction> boundFunctions = + private final Map<FunctionMapKey, EdmFunction> boundFunctions = Collections.synchronizedMap(new HashMap<FunctionMapKey, EdmFunction>()); - private final Map<FullQualifiedName, EdmTerm> terms = + private final Map<FullQualifiedName, EdmTerm> terms = Collections.synchronizedMap(new HashMap<FullQualifiedName, EdmTerm>()); private final Map<FullQualifiedName, EdmAnnotations> annotationGroups = @@ -85,7 +85,7 @@ public abstract class AbstractEdm implements Edm { private Map<String, String> aliasToNamespaceInfo = Collections.synchronizedMap(new HashMap<String, String>()); private boolean aliasToNamespaceInfoCreated = false; - + @Override public List<EdmSchema> getSchemas() { if (schemaList == null) { @@ -114,7 +114,7 @@ public abstract class AbstractEdm implements Edm { private void initSchemas() { schemas = createSchemas(); aliasToNamespaceInfoCreated = true; - + if (schemas == null) { schemas = Collections.emptyMap(); } @@ -125,7 +125,7 @@ public abstract class AbstractEdm implements Edm { public EdmEntityContainer getEntityContainer() { return getEntityContainer(null); } - + @Override public EdmEntityContainer getEntityContainer(final FullQualifiedName namespaceOrAliasFQN) { final FullQualifiedName fqn = resolvePossibleAlias(namespaceOrAliasFQN); @@ -359,37 +359,37 @@ public abstract class AbstractEdm implements Edm { protected abstract Map<String, String> createAliasToNamespaceInfo(); - public void cacheAliasNamespaceInfo(String alias, String namespace) { + public void cacheAliasNamespaceInfo(final String alias, final String namespace) { aliasToNamespaceInfo.put(alias, namespace); } protected abstract EdmEntityContainer createEntityContainer(FullQualifiedName containerName); - public void cacheEntityContainer(FullQualifiedName containerFQN, EdmEntityContainer container) { + public void cacheEntityContainer(final FullQualifiedName containerFQN, final EdmEntityContainer container) { entityContainers.put(containerFQN, container); } protected abstract EdmEnumType createEnumType(FullQualifiedName enumName); - public void cacheEnumType(FullQualifiedName enumName, EdmEnumType enumType) { + public void cacheEnumType(final FullQualifiedName enumName, final EdmEnumType enumType) { enumTypes.put(enumName, enumType); } protected abstract EdmTypeDefinition createTypeDefinition(FullQualifiedName typeDefinitionName); - public void cacheTypeDefinition(FullQualifiedName typeDefName, EdmTypeDefinition typeDef) { + public void cacheTypeDefinition(final FullQualifiedName typeDefName, final EdmTypeDefinition typeDef) { typeDefinitions.put(typeDefName, typeDef); } protected abstract EdmEntityType createEntityType(FullQualifiedName entityTypeName); - public void cacheEntityType(FullQualifiedName entityTypeName, EdmEntityType entityType) { + public void cacheEntityType(final FullQualifiedName entityTypeName, final EdmEntityType entityType) { entityTypes.put(entityTypeName, entityType); } protected abstract EdmComplexType createComplexType(FullQualifiedName complexTypeName); - public void cacheComplexType(FullQualifiedName compelxTypeName, EdmComplexType complexType) { + public void cacheComplexType(final FullQualifiedName compelxTypeName, final EdmComplexType complexType) { complexTypes.put(compelxTypeName, complexType); } @@ -407,7 +407,7 @@ public abstract class AbstractEdm implements Edm { FullQualifiedName bindingParameterTypeName, Boolean isBindingParameterCollection, List<String> parameterNames); - public void cacheFunction(FullQualifiedName functionName, EdmFunction function) { + public void cacheFunction(final FullQualifiedName functionName, final EdmFunction function) { final FunctionMapKey key = new FunctionMapKey(functionName, function.getBindingParameterTypeFqn(), function.isBindingParameterTypeCollection(), function.getParameterNames()); @@ -424,7 +424,7 @@ public abstract class AbstractEdm implements Edm { } } - public void cacheAction(FullQualifiedName actionName, EdmAction action) { + public void cacheAction(final FullQualifiedName actionName, final EdmAction action) { if (action.isBound()) { final ActionMapKey key = new ActionMapKey(actionName, action.getBindingParameterTypeFqn(), action.isBindingParameterTypeCollection()); @@ -435,20 +435,21 @@ public abstract class AbstractEdm implements Edm { } protected abstract EdmTerm createTerm(FullQualifiedName termName); - - public void cacheTerm(FullQualifiedName termName, EdmTerm term) { + + public void cacheTerm(final FullQualifiedName termName, final EdmTerm term) { terms.put(termName, term); } protected abstract EdmAnnotations createAnnotationGroup(FullQualifiedName targetName); - - public void cacheAnnotationGroup(FullQualifiedName annotationsGroupName, EdmAnnotations annotationsGroup) { + + public void cacheAnnotationGroup(final FullQualifiedName annotationsGroupName, + final EdmAnnotations annotationsGroup) { annotationGroups.put(annotationsGroupName, annotationsGroup); } protected abstract List<EdmAnnotation> createAnnotations(FullQualifiedName annotatedName); - -// public void cacheAnnotation(FullQualifiedName annotationsGroupName, EdmAnnotations annotationsGroup) { -// annotationGroups.put(annotationsGroupName, annotationsGroup); -// } + + // public void cacheAnnotation(FullQualifiedName annotationsGroupName, EdmAnnotations annotationsGroup) { + // annotationGroups.put(annotationsGroupName, annotationsGroup); + // } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java index b62325d..ef649df 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java @@ -6,9 +6,9 @@ * 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 @@ -18,6 +18,10 @@ */ package org.apache.olingo.commons.core.edm; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotatable; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -25,10 +29,6 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public abstract class AbstractEdmAnnotatable implements EdmAnnotatable { private final CsdlAnnotatable annotatable; @@ -60,7 +60,7 @@ public abstract class AbstractEdmAnnotatable implements EdmAnnotatable { for (CsdlAnnotation annotation : annotatable.getAnnotations()) { annotationsLocal.add(new EdmAnnotationImpl(edm, annotation)); } - + annotations = Collections.unmodifiableList(annotationsLocal); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java index d9503cc..858b821 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java @@ -6,9 +6,9 @@ * 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 @@ -50,12 +50,12 @@ public abstract class AbstractEdmBindingTarget extends AbstractEdmNamed implemen public List<EdmNavigationPropertyBinding> getNavigationPropertyBindings() { if (navigationPropertyBindings == null) { List<CsdlNavigationPropertyBinding> providerBindings = target.getNavigationPropertyBindings(); - final List<EdmNavigationPropertyBinding> navigationPropertyBindingsLocal = + final List<EdmNavigationPropertyBinding> navigationPropertyBindingsLocal = new ArrayList<EdmNavigationPropertyBinding>(); if (providerBindings != null) { for (CsdlNavigationPropertyBinding binding : providerBindings) { - navigationPropertyBindingsLocal.add(new EdmNavigationPropertyBindingImpl(binding.getPath(), - binding.getTarget())); + navigationPropertyBindingsLocal.add(new EdmNavigationPropertyBindingImpl(binding.getPath(), + binding.getTarget())); } navigationPropertyBindings = Collections.unmodifiableList(navigationPropertyBindingsLocal); } @@ -99,7 +99,7 @@ public abstract class AbstractEdmBindingTarget extends AbstractEdmNamed implemen && !found;) { final EdmNavigationPropertyBinding binding = itor.next(); - if(binding.getPath() == null || binding.getTarget() == null){ + if (binding.getPath() == null || binding.getTarget() == null) { throw new EdmException("Path or Target in navigation property binding must not be null!"); } if (path.startsWith(binding.getPath())) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java index 36638fd..97924c9 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java index d5dd4be..eaf5a5a 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java @@ -6,9 +6,9 @@ * 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 @@ -65,9 +65,9 @@ public abstract class AbstractEdmOperation extends EdmTypeImpl implements EdmOpe } return Collections.unmodifiableList(parameterNames); } - + private void createParameters() { - if(parameters == null) { + if (parameters == null) { final Map<String, EdmParameter> parametersLocal = new LinkedHashMap<String, EdmParameter>(); final List<CsdlParameter> providerParameters = operation.getParameters(); if (providerParameters != null) { @@ -76,7 +76,7 @@ public abstract class AbstractEdmOperation extends EdmTypeImpl implements EdmOpe parametersLocal.put(parameter.getName(), new EdmParameterImpl(edm, parameter)); parameterNamesLocal.add(parameter.getName()); } - + parameters = parametersLocal; parameterNames = parameterNamesLocal; } else { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java index 356500a..ef14501 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java @@ -6,9 +6,9 @@ * 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 @@ -37,9 +37,9 @@ public abstract class AbstractEdmOperationImport extends AbstractEdmNamed implem super(edm, operationImport.getName(), operationImport); this.container = container; if (operationImport.getEntitySet() != null) { - this.entitySet = new Target(operationImport.getEntitySet(), container); + entitySet = new Target(operationImport.getEntitySet(), container); } else { - this.entitySet = null; + entitySet = null; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java index 1c96a6b..51194ce 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java @@ -6,9 +6,9 @@ * 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 @@ -18,6 +18,12 @@ */ package org.apache.olingo.commons.core.edm; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmException; @@ -31,17 +37,11 @@ import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; import org.apache.olingo.commons.api.edm.provider.CsdlProperty; import org.apache.olingo.commons.api.edm.provider.CsdlStructuralType; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements EdmStructuredType { protected EdmStructuredType baseType; protected FullQualifiedName baseTypeName; - + private final CsdlStructuralType providerStructuredType; private List<String> propertyNames; @@ -50,14 +50,14 @@ public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements E private Map<String, EdmNavigationProperty> navigationProperties; public AbstractEdmStructuredType( - final Edm edm, - final FullQualifiedName typeName, - final EdmTypeKind kind, - final CsdlStructuralType structuredType) { + final Edm edm, + final FullQualifiedName typeName, + final EdmTypeKind kind, + final CsdlStructuralType structuredType) { super(edm, typeName, kind, structuredType); - this.baseTypeName = structuredType.getBaseTypeFQN(); - this.providerStructuredType = structuredType; + baseTypeName = structuredType.getBaseTypeFQN(); + providerStructuredType = structuredType; } protected abstract EdmStructuredType buildBaseType(FullQualifiedName baseTypeName); @@ -159,8 +159,8 @@ public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements E if (properties == null) { final Map<String, EdmProperty> localPorperties = new LinkedHashMap<String, EdmProperty>(); final List<CsdlProperty> structureTypeProperties = providerStructuredType.getProperties(); - for (CsdlProperty property : structureTypeProperties) { - localPorperties.put(property.getName(), new EdmPropertyImpl(edm, typeName, property)); + for (CsdlProperty property : structureTypeProperties) { + localPorperties.put(property.getName(), new EdmPropertyImpl(edm, typeName, property)); } properties = Collections.unmodifiableMap(localPorperties); } @@ -169,7 +169,7 @@ public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements E public Map<String, EdmNavigationProperty> getNavigationProperties() { if (navigationProperties == null) { - final Map<String, EdmNavigationProperty> localNavigationProperties = + final Map<String, EdmNavigationProperty> localNavigationProperties = new LinkedHashMap<String, EdmNavigationProperty>(); final List<CsdlNavigationProperty> structuredTypeNavigationProperties = providerStructuredType.getNavigationProperties(); @@ -177,19 +177,21 @@ public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements E if (structuredTypeNavigationProperties != null) { for (CsdlNavigationProperty navigationProperty : structuredTypeNavigationProperties) { localNavigationProperties.put(navigationProperty.getName(), - new EdmNavigationPropertyImpl(edm, typeName, navigationProperty)); + new EdmNavigationPropertyImpl(edm, typeName, navigationProperty)); } } - + navigationProperties = Collections.unmodifiableMap(localNavigationProperties); } return navigationProperties; } + @Override public boolean isOpenType() { return providerStructuredType.isOpenType(); } + @Override public boolean isAbstract() { return providerStructuredType.isAbstract(); }
