You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/05/22 13:43:42 UTC
[34/51] [abbrv] [partial] Removing /ODataJClient: merge complete
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractFilterFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractFilterFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractFilterFactory.java
deleted file mode 100644
index a0c2dc5..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractFilterFactory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public abstract class AbstractFilterFactory implements FilterFactory {
-
- private static final long serialVersionUID = -6141317149802621836L;
-
- protected static final String NULL = "null";
-
- @Override
- public ODataFilter match(final ODataFilterArg arg) {
- return new MatchFilter(arg);
- }
-
- @Override
- public ODataFilter eq(final String key, final Object value) {
- return new EqFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter eq(final ODataFilterArg left, final ODataFilterArg right) {
- return new EqFilter(left, right);
- }
-
- @Override
- public ODataFilter ne(final String key, final Object value) {
- return new NeFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter ne(final ODataFilterArg left, final ODataFilterArg right) {
- return new NeFilter(left, right);
- }
-
- @Override
- public ODataFilter gt(final String key, final Object value) {
- return new GtFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter gt(final ODataFilterArg left, final ODataFilterArg right) {
- return new GtFilter(left, right);
- }
-
- @Override
- public ODataFilter ge(final String key, final Object value) {
- return new GeFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter ge(final ODataFilterArg left, final ODataFilterArg right) {
- return new GeFilter(left, right);
- }
-
- @Override
- public ODataFilter lt(final String key, final Object value) {
- return new LtFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter lt(final ODataFilterArg left, final ODataFilterArg right) {
- return new LtFilter(left, right);
- }
-
- @Override
- public ODataFilter le(final String key, final Object value) {
- return new LeFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter le(final ODataFilterArg left, final ODataFilterArg right) {
- return new LeFilter(left, right);
- }
-
- @Override
- public ODataFilter and(final ODataFilter left, final ODataFilter right) {
- return new AndFilter(left, right);
- }
-
- @Override
- public ODataFilter or(final ODataFilter left, final ODataFilter right) {
- return new OrFilter(left, right);
- }
-
- @Override
- public ODataFilter not(final ODataFilter filter) {
- return new NotFilter(filter);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AndFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AndFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AndFilter.java
deleted file mode 100644
index 5e7097a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AndFilter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class AndFilter implements ODataFilter {
-
- private final ODataFilter left;
-
- private final ODataFilter right;
-
- public AndFilter(final ODataFilter left, final ODataFilter right) {
- this.left = left;
- this.right = right;
- }
-
- @Override
- public String build() {
- return new StringBuilder().
- append('(').append(left.build()).
- append(" and ").
- append(right.build()).append(')').
- toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/EqFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/EqFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/EqFilter.java
deleted file mode 100644
index 3f4a55c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/EqFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class EqFilter extends AbstractComparingFilter {
-
- EqFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "eq";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/FilterFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/FilterFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/FilterFactory.java
deleted file mode 100644
index 5867a56..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/FilterFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-import java.io.Serializable;
-
-/**
- * OData filter factory.
- */
-public interface FilterFactory extends Serializable {
-
- ODataFilter match(ODataFilterArg arg);
-
- ODataFilter eq(String key, Object value);
-
- ODataFilter eq(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter ne(String key, Object value);
-
- ODataFilter ne(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter gt(String key, Object value);
-
- ODataFilter gt(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter ge(String key, Object value);
-
- ODataFilter ge(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter lt(String key, Object value);
-
- ODataFilter lt(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter le(String key, Object value);
-
- ODataFilter le(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter and(ODataFilter left, ODataFilter right);
-
- ODataFilter or(ODataFilter left, ODataFilter right);
-
- ODataFilter not(ODataFilter filter);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GeFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GeFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GeFilter.java
deleted file mode 100644
index ee3fa2d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GeFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class GeFilter extends AbstractComparingFilter {
-
- GeFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "ge";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GtFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GtFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GtFilter.java
deleted file mode 100644
index fee2ec6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GtFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class GtFilter extends AbstractComparingFilter {
-
- GtFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "gt";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LeFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LeFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LeFilter.java
deleted file mode 100644
index 521737d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LeFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class LeFilter extends AbstractComparingFilter {
-
- LeFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "le";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LtFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LtFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LtFilter.java
deleted file mode 100644
index 9c48996..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LtFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class LtFilter extends AbstractComparingFilter {
-
- LtFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "lt";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/MatchFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/MatchFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/MatchFilter.java
deleted file mode 100644
index 6f4dd83..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/MatchFilter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class MatchFilter implements ODataFilter {
-
- private final ODataFilterArg arg;
-
- MatchFilter(final ODataFilterArg arg) {
- this.arg = arg;
- }
-
- @Override
- public String build() {
- return arg.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NeFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NeFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NeFilter.java
deleted file mode 100644
index d776123..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NeFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class NeFilter extends AbstractComparingFilter {
-
- NeFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "ne";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NotFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NotFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NotFilter.java
deleted file mode 100644
index 2c0aa2f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NotFilter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class NotFilter implements ODataFilter {
-
- private final ODataFilter filter;
-
- public NotFilter(final ODataFilter left) {
- this.filter = left;
- }
-
- @Override
- public String build() {
- return new StringBuilder("not (").append(filter.build()).append(')').toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilter.java
deleted file mode 100644
index 5e7a826..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-/**
- * Interface for any available filter; obtain instances via <tt>ODataFilterFactory</tt>.
- *
- * @see com.msopentech.odatajclient.engine.uri.filter.ODataFilterFactory
- */
-public interface ODataFilter {
-
- /**
- * @return String representation of this filter.
- */
- String build();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArg.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArg.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArg.java
deleted file mode 100644
index 17ee7a8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArg.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-/**
- * Interface for any available filter argument; obtain instances via
- * <tt>ODataFilterArgFactory</tt>.
- *
- * @see com.msopentech.odatajclient.engine.uri.filter.ODataFilterArgFactory
- */
-public interface ODataFilterArg {
-
- /**
- * @return String representation of this filter argument.
- */
- String build();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArgFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArgFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArgFactory.java
deleted file mode 100644
index b13355b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArgFactory.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-/**
- * OData filter arguments factory.
- */
-public final class ODataFilterArgFactory {
-
- private ODataFilterArgFactory() {
- // Empty private constructor for static utility classes
- }
-
- public static ODataFilterArg property(final String propertyPath) {
- return new ODataFilterProperty(propertyPath);
- }
-
- public static ODataFilterArg literal(final Object value) {
- return new ODataFilterLiteral(value);
- }
-
- public static ODataFilterArg add(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("add", first, second);
- }
-
- public static ODataFilterArg sub(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("add", first, second);
- }
-
- public static ODataFilterArg mul(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("mul", first, second);
- }
-
- public static ODataFilterArg div(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("div", first, second);
- }
-
- public static ODataFilterArg mod(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("mod", first, second);
- }
-
- public static ODataFilterArg substringof(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("substringof", first, second);
- }
-
- public static ODataFilterArg endswith(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("endswith", first, second);
- }
-
- public static ODataFilterArg startswith(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("startswith", first, second);
- }
-
- public static ODataFilterArg length(final ODataFilterArg param) {
- return new ODataFilterFunction("length", param);
- }
-
- public static ODataFilterArg indexof(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("indexof", first, second);
- }
-
- public static ODataFilterArg replace(
- final ODataFilterArg first, final ODataFilterArg second, final ODataFilterArg third) {
-
- return new ODataFilterFunction("replace", first, second, third);
- }
-
- public static ODataFilterArg substring(final ODataFilterArg arg, final ODataFilterArg pos) {
- return new ODataFilterFunction("substring", arg, pos);
- }
-
- public static ODataFilterArg substring(
- final ODataFilterArg arg, final ODataFilterArg pos, final ODataFilterArg length) {
-
- return new ODataFilterFunction("substring", arg, pos, length);
- }
-
- public static ODataFilterArg tolower(final ODataFilterArg param) {
- return new ODataFilterFunction("tolower", param);
- }
-
- public static ODataFilterArg toupper(final ODataFilterArg param) {
- return new ODataFilterFunction("toupper", param);
- }
-
- public static ODataFilterArg trim(final ODataFilterArg param) {
- return new ODataFilterFunction("trim", param);
- }
-
- public static ODataFilterArg concat(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("concat", first, second);
- }
-
- public static ODataFilterArg day(final ODataFilterArg param) {
- return new ODataFilterFunction("day", param);
- }
-
- public static ODataFilterArg hour(final ODataFilterArg param) {
- return new ODataFilterFunction("hour", param);
- }
-
- public static ODataFilterArg minute(final ODataFilterArg param) {
- return new ODataFilterFunction("minute", param);
- }
-
- public static ODataFilterArg month(final ODataFilterArg param) {
- return new ODataFilterFunction("month", param);
- }
-
- public static ODataFilterArg second(final ODataFilterArg param) {
- return new ODataFilterFunction("second", param);
- }
-
- public static ODataFilterArg year(final ODataFilterArg param) {
- return new ODataFilterFunction("year", param);
- }
-
- public static ODataFilterArg round(final ODataFilterArg param) {
- return new ODataFilterFunction("round", param);
- }
-
- public static ODataFilterArg floor(final ODataFilterArg param) {
- return new ODataFilterFunction("floor", param);
- }
-
- public static ODataFilterArg ceiling(final ODataFilterArg param) {
- return new ODataFilterFunction("ceiling", param);
- }
-
- public static ODataFilterArg isof(final ODataFilterArg param) {
- return new ODataFilterFunction("isof", param);
- }
-
- public static ODataFilterArg isof(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("isof", first, second);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterFunction.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterFunction.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterFunction.java
deleted file mode 100644
index caf82ba..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterFunction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-import org.apache.commons.lang3.StringUtils;
-
-public class ODataFilterFunction implements ODataFilterArg {
-
- private final String function;
-
- private final ODataFilterArg[] params;
-
- ODataFilterFunction(final String function, final ODataFilterArg... params) {
- this.function = function;
- this.params = params;
- }
-
- @Override
- public String build() {
- final String[] strParams = new String[params.length];
- for (int i = 0; i < params.length; i++) {
- strParams[i] = params[i].build();
- }
-
- return new StringBuilder(function).
- append('(').
- append(StringUtils.join(strParams, ',')).
- append(')').
- toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterLiteral.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterLiteral.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterLiteral.java
deleted file mode 100644
index 1674f62..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterLiteral.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-
-/**
- * Filter value literals; obtain instances via <tt>ODataFilterArgFactory</tt>.
- *
- * @see com.msopentech.odatajclient.engine.uri.filter.ODataFilterArgFactory
- */
-public class ODataFilterLiteral implements ODataFilterArg {
-
- private final Object value;
-
- ODataFilterLiteral(final Object value) {
- this.value = value;
- }
-
- @Override
- public String build() {
- return URIUtils.escape(value);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterOp.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterOp.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterOp.java
deleted file mode 100644
index 8fa0f9b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterOp.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class ODataFilterOp implements ODataFilterArg {
-
- private final String op;
-
- private final ODataFilterArg first;
-
- private final ODataFilterArg second;
-
- ODataFilterOp(final String op, final ODataFilterArg first, final ODataFilterArg second) {
- this.op = op;
- this.first = first;
- this.second = second;
- }
-
- @Override
- public String build() {
- return new StringBuilder().
- append('(').append(first.build()).
- append(' ').append(op).append(' ').
- append(second.build()).append(')').
- toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterProperty.java
deleted file mode 100644
index 3178299..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterProperty.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-/**
- * Filter property path; obtain instances via <tt>ODataFilterArgFactory</tt>.
- *
- * @see com.msopentech.odatajclient.engine.uri.filter.ODataFilterArgFactory
- */
-public class ODataFilterProperty implements ODataFilterArg {
-
- private final String propertyPath;
-
- ODataFilterProperty(final String value) {
- this.propertyPath = value;
- }
-
- @Override
- public String build() {
- return propertyPath;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/OrFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/OrFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/OrFilter.java
deleted file mode 100644
index 4a0a543..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/OrFilter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class OrFilter implements ODataFilter {
-
- private final ODataFilter left;
-
- private final ODataFilter right;
-
- public OrFilter(final ODataFilter left, final ODataFilter right) {
- this.left = left;
- this.right = right;
- }
-
- @Override
- public String build() {
- return new StringBuilder().
- append('(').append(left.build()).
- append(" or ").
- append(right.build()).append(')').
- toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V3FilterFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V3FilterFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V3FilterFactory.java
deleted file mode 100644
index d06ed58..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V3FilterFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class V3FilterFactory extends AbstractFilterFactory {
-
- private static final long serialVersionUID = 1092594961118334631L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V4FilterFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V4FilterFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V4FilterFactory.java
deleted file mode 100644
index 00dac25..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V4FilterFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.uri.filter;
-
-public class V4FilterFactory extends AbstractFilterFactory {
-
- private static final long serialVersionUID = -5358934829490623191L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AbstractDOMParser.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AbstractDOMParser.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AbstractDOMParser.java
deleted file mode 100644
index 4037b63..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AbstractDOMParser.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-import java.io.InputStream;
-import java.io.Writer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * DOM Parser.
- */
-public abstract class AbstractDOMParser {
-
- /**
- * Parses the given input into a DOM tree.
- *
- * @param input stream to be parsed and de-serialized.
- * @return DOM tree
- */
- public abstract Element deserialize(InputStream input);
-
- /**
- * Writes DOM object by the given writer.
- *
- * @param content DOM to be streamed.
- * @param writer writer.
- */
- public abstract void serialize(Node content, Writer writer);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AndroidDOMParserImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AndroidDOMParserImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AndroidDOMParserImpl.java
deleted file mode 100644
index 62d8834..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AndroidDOMParserImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-import java.io.InputStream;
-import java.io.Writer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class AndroidDOMParserImpl extends AbstractDOMParser {
-
- @Override
- public Element deserialize(final InputStream input) {
- try {
- return XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder().parse(input).getDocumentElement();
- } catch (Exception e) {
- throw new IllegalArgumentException("Could not parse DOM", e);
- }
- }
-
- @Override
- public void serialize(final Node content, final Writer writer) {
- try {
- TransformerFactory.newInstance().newTransformer().
- transform(new DOMSource(content), new StreamResult(writer));
- } catch (Exception e) {
- throw new IllegalArgumentException("While serializing DOM element", e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AssociationSetBindingDetails.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AssociationSetBindingDetails.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AssociationSetBindingDetails.java
deleted file mode 100644
index 1341ed6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AssociationSetBindingDetails.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.AssociationSet;
-
-/**
- * Association set binding details bean.
- */
-public class AssociationSetBindingDetails {
-
- private final AssociationSet associationSet;
-
- private final AbstractEntityContainer<?> container;
-
- private final AbstractSchema<?, ?, ?, ?> schema;
-
- public AssociationSetBindingDetails(
- final AssociationSet associationSet,
- final AbstractEntityContainer<?> container,
- final AbstractSchema<?, ?, ?, ?> schema) {
- this.associationSet = associationSet;
- this.container = container;
- this.schema = schema;
- }
-
- public AssociationSet getAssociationSet() {
- return associationSet;
- }
-
- public AbstractEntityContainer<?> getContainer() {
- return container;
- }
-
- public AbstractSchema<?, ?, ?, ?> getSchema() {
- return schema;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/DefaultDOMParserImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/DefaultDOMParserImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/DefaultDOMParserImpl.java
deleted file mode 100644
index 469a2bb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/DefaultDOMParserImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-import java.io.InputStream;
-import java.io.Writer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSOutput;
-import org.w3c.dom.ls.LSParser;
-import org.w3c.dom.ls.LSSerializer;
-
-public class DefaultDOMParserImpl extends AbstractDOMParser {
-
- private static final Object MONITOR = new Object();
-
- private static DOMImplementationLS DOM_IMPL;
-
- private void lazyInit() throws ClassNotFoundException, InstantiationException, IllegalAccessException {
- synchronized (MONITOR) {
- if (DOM_IMPL == null) {
- final DOMImplementationRegistry reg = DOMImplementationRegistry.newInstance();
- DOM_IMPL = (DOMImplementationLS) reg.getDOMImplementation("LS");
- }
- }
- }
-
- @Override
- public Element deserialize(final InputStream input) {
- try {
- lazyInit();
-
- final LSParser parser = DOM_IMPL.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
-
- final LSInput lsinput = DOM_IMPL.createLSInput();
- lsinput.setByteStream(input);
-
- return parser.parse(lsinput).getDocumentElement();
- } catch (Exception e) {
- throw new IllegalArgumentException("Could not parse DOM", e);
- }
- }
-
- @Override
- public void serialize(final Node content, final Writer writer) {
- try {
- lazyInit();
-
- final LSSerializer serializer = DOM_IMPL.createLSSerializer();
-
- final LSOutput lso = DOM_IMPL.createLSOutput();
- lso.setCharacterStream(writer);
-
- serializer.write(content, lso);
- } catch (Exception e) {
- throw new IllegalArgumentException("While serializing DOM element", e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/MetadataUtils.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/MetadataUtils.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/MetadataUtils.java
deleted file mode 100644
index 83e1c76..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/MetadataUtils.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Association;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.AssociationSet;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.AssociationSetEnd;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Schema;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationPropertyBinding;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Metadata utilities.
- */
-public class MetadataUtils {
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(MetadataUtils.class);
-
- public static AssociationSetBindingDetails getAssociationSetBindingDetails(
- final Association association, final String associationNamespace, final EdmV3Metadata metadata) {
-
- final StringBuilder associationName = new StringBuilder();
- associationName.append(associationNamespace).append('.').append(association.getName());
-
- for (Schema schema : metadata.getSchemas()) {
- for (EntityContainer container : schema.getEntityContainers()) {
- final AssociationSet associationSet = getAssociationSet(associationName.toString(), container);
- if (associationSet != null) {
- return new AssociationSetBindingDetails(associationSet, container, schema);
- }
- }
- }
-
- throw new IllegalStateException("Association set not found");
- }
-
- public static Association getAssociation(final Schema schema, final String relationship) {
- return schema.getAssociation(relationship.substring(relationship.lastIndexOf('.') + 1));
- }
-
- public static AssociationSet getAssociationSet(final String association, final EntityContainer container) {
- LOG.debug("Search for association set {}", association);
-
- for (AssociationSet associationSet : container.getAssociationSets()) {
- LOG.debug("Retrieved association set '{}:{}'", associationSet.getName(), associationSet.getAssociation());
- if (associationSet.getAssociation().equals(association)) {
- return associationSet;
- }
- }
-
- return null;
- }
-
- public static AbstractSchema<?, ?, ?, ?> getSchemaByNamespaceOrAlias(
- final AbstractEdmMetadata<?, ?, ?, ?, ?, ?, ?> metadata,
- final String name) {
-
- if (StringUtils.isNotBlank(name)) {
- for (AbstractSchema<?, ?, ?, ?> schema : metadata.getSchemas()) {
- if (name.equals(schema.getNamespace()) || name.equals(schema.getAlias())) {
- return schema;
- }
- }
- }
-
- return null;
- }
-
- public static AbstractEntityContainer<?> getContainerByName(
- final AbstractSchema<?, ?, ?, ?> schema,
- final String name) {
-
- for (AbstractEntityContainer<?> container : schema.getEntityContainers()) {
- if (container.getName().equals(name)) {
- return container;
- }
- }
-
- return null;
- }
-
- public static AbstractEntitySet getEntitySet(
- final AssociationSetBindingDetails associationSetBindingDetails, final String name) {
-
- final String entitySetName = getEntitySetName(associationSetBindingDetails.getAssociationSet(), name);
-
- for (AbstractEntitySet entitySet : associationSetBindingDetails.getContainer().getEntitySets()) {
- if (entitySet.getName().equals(entitySetName)) {
- return entitySet;
- }
- }
-
- return null;
- }
-
- public static AbstractEntitySet getEntitySet(
- final AbstractEdmMetadata<?, ?, ?, ?, ?, ?, ?> metadata,
- final String namespace,
- final String containerName,
- final String name) {
-
- for (AbstractSchema<?, ?, ?, ?> schema : metadata.getSchemas()) {
- if (schema.getNamespace().equals(namespace)) {
- for (AbstractEntityContainer<?> container : schema.getEntityContainers()) {
- if (containerName.equals(container.getName())) {
- for (AbstractEntitySet entitySet : container.getEntitySets()) {
- if (entitySet.getName().equals(name)) {
- return entitySet;
- }
- }
- }
- }
- }
- }
-
- return null;
- }
-
- public static AbstractEntitySet getEntitySet(final AbstractEntityContainer<?> container, final String name) {
-
- for (AbstractEntitySet entitySet : container.getEntitySets()) {
- if (entitySet.getName().equalsIgnoreCase(name)) {
- return entitySet;
- }
- }
-
- return null;
- }
-
- public static NavigationPropertyBinding getNavigationBindingByPath(
- final List<NavigationPropertyBinding> bindings,
- final String path) {
- for (NavigationPropertyBinding binding : bindings) {
- if (binding.getPath().equals(path)) {
- return binding;
- }
- }
-
- return null;
- }
-
- public static String getEntitySetName(final AssociationSet associationSet, final String role) {
- for (AssociationSetEnd end : associationSet.getEnds()) {
- if (end.getRole().equals(role)) {
- return end.getEntitySet();
- }
- }
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/NavigationPropertyBindingDetails.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/NavigationPropertyBindingDetails.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/NavigationPropertyBindingDetails.java
deleted file mode 100644
index 43a95cc..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/NavigationPropertyBindingDetails.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractNavigationProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-
-/**
- * Navigation property binding details bean.
- */
-public class NavigationPropertyBindingDetails {
-
- private final AbstractNavigationProperty navigationProperty;
-
- private final AbstractEntitySet entitySet;
-
- private final AbstractSchema<?, ?, ?, ?> schema;
-
- private final AbstractEntityContainer<?> container;
-
- public NavigationPropertyBindingDetails(
- final AbstractNavigationProperty navigationProperty,
- final AbstractEntitySet entitySet,
- final AbstractEntityContainer<?> container,
- final AbstractSchema<?, ?, ?, ?> schema) {
- this.navigationProperty = navigationProperty;
- this.schema = schema;
- this.entitySet = entitySet;
- this.container = container;
- }
-
- public AbstractNavigationProperty getNavigationProperty() {
- return navigationProperty;
- }
-
- public AbstractSchema<?, ?, ?, ?> getSchema() {
- return schema;
- }
-
- public AbstractEntitySet getEntitySet() {
- return entitySet;
- }
-
- public AbstractEntityContainer<?> getContainer() {
- return container;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataBatchConstants.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataBatchConstants.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataBatchConstants.java
deleted file mode 100644
index af7503e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataBatchConstants.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-/**
- * Constant values related to the OData protocol.
- */
-public class ODataBatchConstants {
-
- /**
- * Batch/Changeset content type.
- */
- public static final String MULTIPART_CONTENT_TYPE = "multipart/mixed";
-
- /**
- * Batch item content type.
- */
- public static final String ITEM_CONTENT_TYPE = "application/http";
-
- /**
- * Boundary key.
- */
- public static final String BOUNDARY = "boundary";
-
- /**
- * Item content type.
- */
- public static String ITEM_CONTENT_TYPE_LINE = "Content-Type: application/http";
-
- /**
- * Item transfer encoding.
- */
- public static String ITEM_TRANSFER_ENCODING_LINE = "Content-Transfer-Encoding: binary";
-
- /**
- * Content id header name.
- */
- public static String CHANGESET_CONTENT_ID_NAME = "Content-ID";
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataConstants.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataConstants.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataConstants.java
deleted file mode 100644
index c0db5b9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataConstants.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-import javax.xml.XMLConstants;
-
-/**
- * Constant values related to the OData protocol.
- */
-public class ODataConstants {
-
- // Other stuff
- public final static String UTF8 = "UTF-8";
-
- public final static String NAME = "name";
-
- public final static String PROPERTIES = "properties";
-
- // XML namespaces and prefixes
- public final static String NS_ATOM = "http://www.w3.org/2005/Atom";
-
- public static final String NS_GEORSS = "http://www.georss.org/georss";
-
- public static final String NS_GML = "http://www.opengis.net/gml";
-
- public static final String XMLNS_DATASERVICES = XMLConstants.XMLNS_ATTRIBUTE + ":d";
-
- public static final String PREFIX_DATASERVICES = "d:";
-
- public static final String XMLNS_METADATA = XMLConstants.XMLNS_ATTRIBUTE + ":m";
-
- public static final String PREFIX_METADATA = "m:";
-
- public static final String XMLNS_GEORSS = XMLConstants.XMLNS_ATTRIBUTE + ":georss";
-
- public static final String PREFIX_GEORSS = "georss:";
-
- public static final String XMLNS_GML = XMLConstants.XMLNS_ATTRIBUTE + ":gml";
-
- public static final String PREFIX_GML = "gml:";
-
- /**
- * Edit link rel value.
- */
- public static final String EDIT_LINK_REL = "edit";
-
- /**
- * Self link rel value.
- */
- public static final String SELF_LINK_REL = "self";
-
- public static final String NEXT_LINK_REL = "next";
-
- // XML elements and attributes
- public static final String ELEM_PROPERTIES = PREFIX_METADATA + PROPERTIES;
-
- public static final String ELEM_ELEMENT = "element";
-
- public final static String ATTR_TYPE = "type";
-
- public static final String ATTR_M_TYPE = PREFIX_METADATA + ATTR_TYPE;
-
- public static final String ATTR_NULL = PREFIX_METADATA + "null";
-
- public static final String ATTR_XMLBASE = "xml:base";
-
- public static final String ATTR_REL = "rel";
-
- public static final String ATTR_HREF = "href";
-
- public static final String ATTR_METADATA = "metadata";
-
- public static final String ATTR_TITLE = "title";
-
- public static final String ATTR_TARGET = "target";
-
- public static final String ELEM_COLLECTION = "collection";
-
- public static final String ATTR_SRSNAME = PREFIX_GML + "srsName";
-
- public static final String ELEM_POINT = PREFIX_GML + "Point";
-
- public static final String ELEM_MULTIPOINT = PREFIX_GML + "MultiPoint";
-
- public static final String ELEM_POINTMEMBERS = PREFIX_GML + "pointMembers";
-
- public static final String ELEM_LINESTRING = PREFIX_GML + "LineString";
-
- public static final String ELEM_MULTILINESTRING = PREFIX_GML + "MultiCurve";
-
- public static final String ELEM_LINESTRINGMEMBERS = PREFIX_GML + "curveMembers";
-
- public static final String ELEM_POLYGON = PREFIX_GML + "Polygon";
-
- public static final String ELEM_POLYGON_EXTERIOR = PREFIX_GML + "exterior";
-
- public static final String ELEM_POLYGON_INTERIOR = PREFIX_GML + "interior";
-
- public static final String ELEM_POLYGON_LINEARRING = PREFIX_GML + "LinearRing";
-
- public static final String ELEM_MULTIPOLYGON = PREFIX_GML + "MultiSurface";
-
- public static final String ELEM_SURFACEMEMBERS = PREFIX_GML + "surfaceMembers";
-
- public static final String ELEM_GEOCOLLECTION = PREFIX_GML + "MultiGeometry";
-
- public static final String ELEM_GEOMEMBERS = PREFIX_GML + "geometryMembers";
-
- public static final String ELEM_POS = PREFIX_GML + "pos";
-
- public static final String ELEM_POSLIST = PREFIX_GML + "posList";
-
- public static final String ELEM_PROPERTY = "property";
-
- public static final String ELEM_URI = "uri";
-
- // JSON stuff
- public final static String JSON_METADATA = "odata.metadata";
-
- public final static String JSON_TYPE = "odata.type";
-
- public final static String JSON_ETAG = "odata.etag";
-
- public final static String JSON_MEDIA_ETAG = "odata.mediaETag";
-
- public final static String JSON_ID = "odata.id";
-
- public final static String JSON_READ_LINK = "odata.readLink";
-
- public final static String JSON_EDIT_LINK = "odata.editLink";
-
- public final static String JSON_MEDIAREAD_LINK = "odata.mediaReadLink";
-
- public final static String JSON_MEDIAEDIT_LINK = "odata.mediaEditLink";
-
- public final static String JSON_MEDIA_CONTENT_TYPE = "odata.mediaContentType";
-
- public final static String JSON_NAVIGATION_LINK_SUFFIX = "@odata.navigationLinkUrl";
-
- public final static String JSON_BIND_LINK_SUFFIX = "@odata.bind";
-
- public final static String JSON_ASSOCIATION_LINK_SUFFIX = "@odata.associationLinkUrl";
-
- public final static String JSON_MEDIAEDIT_LINK_SUFFIX = "@odata.mediaEditLink";
-
- public final static String JSON_VALUE = "value";
-
- public final static String JSON_URL = "url";
-
- public final static String JSON_COORDINATES = "coordinates";
-
- public final static String JSON_GEOMETRIES = "geometries";
-
- public final static String JSON_CRS = "crs";
-
- public final static String JSON_GIS_URLPREFIX = "http://www.opengis.net/def/crs/EPSG/0/";
-
- // Atom stuff
- public final static String ATOM_ELEM_ENTRY = "entry";
-
- public final static String ATOM_ELEM_FEED = "feed";
-
- public final static String ATOM_ELEM_CATEGORY = "category";
-
- public final static String ATOM_ELEM_ID = "id";
-
- public final static String ATOM_ELEM_LINK = "link";
-
- public final static String ATOM_ELEM_CONTENT = "content";
-
- public static final String ATOM_ELEM_TITLE = "title";
-
- public static final String ATOM_ELEM_SUMMARY = "summary";
-
- public static final String ATOM_ELEM_UPDATED = "updated";
-
- public static final String ATOM_ELEM_AUTHOR = "author";
-
- public static final String ATOM_ELEM_AUTHOR_NAME = "name";
-
- public static final String ATOM_ELEM_AUTHOR_URI = "uri";
-
- public static final String ATOM_ELEM_AUTHOR_EMAIL = "email";
-
- public static final String ATOM_ELEM_ACTION = PREFIX_METADATA + "action";
-
- public static final String ATOM_ELEM_INLINE = PREFIX_METADATA + "inline";
-
- public static final String ATOM_ATTR_TITLE = "atom:title";
-
- public static final String ATOM_ATTR_TERM = "term";
-
- public static final String ATOM_ATTR_SCHEME = "scheme";
-
- public static final String ATOM_ATTR_SRC = "src";
-
- public static final String ATOM_ATTR_ETAG = PREFIX_METADATA + "etag";
-
- public static final String ATOM_ATTR_COUNT = PREFIX_METADATA + "count";
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataVersion.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataVersion.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataVersion.java
deleted file mode 100644
index ba4363b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataVersion.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public enum ODataVersion {
-
- V3("3.0"),
- V4("4.0");
-
- public static final String NS_DATASERVICES = "dataservices";
-
- public static final String NS_METADATA = "metadata";
-
- public static final String NS_DATA = "data";
-
- public static final String NS_SCHEME = "scheme";
-
- public static final String NAVIGATION_LINK_REL = "navigationLinkRel";
-
- public static final String ASSOCIATION_LINK_REL = "associationLinkRel";
-
- public static final String MEDIA_EDIT_LINK_REL = "mediaEditLinkRel";
-
- private static final Map<String, String> V3_NAMESPACES = Collections.unmodifiableMap(new HashMap<String, String>() {
-
- private static final long serialVersionUID = 3109256773218160485L;
-
- {
- put(NS_DATASERVICES, "http://schemas.microsoft.com/ado/2007/08/dataservices");
- put(NS_METADATA, "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata");
- put(NS_SCHEME, "http://schemas.microsoft.com/ado/2007/08/dataservices/scheme");
- put(NAVIGATION_LINK_REL, "http://schemas.microsoft.com/ado/2007/08/dataservices/related/");
- put(ASSOCIATION_LINK_REL, "http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/");
- put(MEDIA_EDIT_LINK_REL, "http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/");
- }
- });
-
- private static final Map<String, String> V4_NAMESPACES = Collections.unmodifiableMap(new HashMap<String, String>() {
-
- private static final long serialVersionUID = 3109256773218160485L;
-
- {
- put(NS_METADATA, "http://docs.oasis-open.org/odata/ns/metadata");
- put(NS_DATA, "http://docs.oasis-open.org/odata/ns/data");
- }
- });
-
- private final String version;
-
- private ODataVersion(final String version) {
- this.version = version;
- }
-
- public Map<String, String> getNamespaceMap() {
- return this == V3 ? V3_NAMESPACES : V4_NAMESPACES;
- }
-
- @Override
- public String toString() {
- return version;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/QualifiedName.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/QualifiedName.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/QualifiedName.java
deleted file mode 100644
index d3174dd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/QualifiedName.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.msopentech.odatajclient.engine.utils;
-
-import org.apache.commons.lang3.StringUtils;
-
-public class QualifiedName {
-
- private final String namespace;
-
- private final String name;
-
- public QualifiedName(final String namespace, final String name) {
- if (StringUtils.isBlank(name)) {
- throw new IllegalArgumentException("Invalid name " + name);
- }
-
- this.namespace = namespace;
- this.name = name;
- }
-
- public QualifiedName(final String qualifiedName) {
- if (StringUtils.isNoneBlank(qualifiedName) && !qualifiedName.trim().endsWith(".")) {
- int lastDotIndex = qualifiedName.lastIndexOf('.');
- this.namespace = qualifiedName.substring(0, lastDotIndex > 0 ? lastDotIndex : 0);
- this.name = qualifiedName.substring(lastDotIndex + 1);
- } else {
- throw new IllegalArgumentException("Invalid qualified name " + qualifiedName);
- }
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public String getName() {
- return name;
- }
-
- @Override
- public String toString() {
- final StringBuilder builder = new StringBuilder();
-
- if (StringUtils.isNoneBlank(namespace)) {
- builder.append(namespace).append('.');
- }
-
- return builder.append(name).toString();
- }
-}