TEIID-5405 adding a servlet property to control default version handling

olingo/src/main/java/org/teiid/olingo/web/ODataFilter.java

@@ -62,6 +62,8 @@ public class ODataFilter implements Filter, VDBLifeCycleListener {
     protected Map<VDBKey, SoftReference<OlingoBridge>> contextMap = Collections
             .synchronizedMap(new LRUCache<VDBKey, SoftReference<OlingoBridge>>());
     private volatile boolean listenerRegistered = false;
+    //default odata behavior requires explicit versioning
+    private String defaultVdbVersion = "1"; //$NON-NLS-1$ 
 
     @Override
     public void init(FilterConfig config) throws ServletException {
@@ -75,6 +77,11 @@ public void init(FilterConfig config) throws ServletException {
         if (proxyURI != null) {
             this.proxyBaseURI = proxyURI;
         }
+
+        String value = config.getInitParameter("explicit-vdb-version");  //$NON-NLS-1$
+        if (value != null && !Boolean.valueOf(value)) {
+            defaultVdbVersion = null; 
+        }
 
         Properties props = new Properties();
         Enumeration<String> names = config.getServletContext().getInitParameterNames();
@@ -89,6 +96,10 @@ public void init(FilterConfig config) throws ServletException {
         }
         this.initProperties = props;
     }
+
+    public String getDefaultVdbVersion() {
+        return defaultVdbVersion;
+    }
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response,
@@ -200,7 +211,7 @@ public void internalDoFilter(ServletRequest request, ServletResponse response,
         	if (key.getVersion() != null) {
         		throw new TeiidProcessingException(ODataPlugin.Event.TEIID16044, ODataPlugin.Util.gs(ODataPlugin.Event.TEIID16044, key));
         	}
-        	key = new VDBKey(vdbName, "1"); //$NON-NLS-1$ //legacy behavior, default to version 1
+    	    key = new VDBKey(vdbName, defaultVdbVersion);
         }
 
         SoftReference<OlingoBridge> ref = this.contextMap.get(key);

olingo/src/main/webapp/WEB-INF/web.xml

@@ -73,6 +73,20 @@
              <param-value>?</param-value>
        </init-param>
        -->
+
+        <!-- 
+            When explicit-vdb-version is true, an explicit vdb version needs to be part of the 
+            url to use anything other than the default verion 1 vdb.
+            
+            When explicit-vdb-version is false, the odata vdb version will be determined 
+            just like a JDBC connection.
+        -->
+       <!-- 
+       <init-param>
+            <param-name>explicit-vdb-version</param-name>
+            <param-value>true</param-value>       
+       </init-param>
+       -->
     </filter>
 
     <filter-mapping>

olingo/src/test/java/org/teiid/olingo/gzip/TestODataFilter.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags and
+ * the COPYRIGHT.txt file distributed with this work.
+ *
+ * Licensed 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 org.teiid.olingo.gzip;
+
+import static org.junit.Assert.*;
+
+import java.util.Collections;
+
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.teiid.olingo.web.ODataFilter;
+
+@SuppressWarnings("nls")
+public class TestODataFilter {
+
+    @Test public void testVdbVersion() throws Exception {
+        ODataFilter filter = new ODataFilter();
+        FilterConfig config = Mockito.mock(FilterConfig.class);
+        ServletContext mock = Mockito.mock(ServletContext.class);
+        Mockito.stub(mock.getInitParameterNames()).toReturn(Collections.emptyEnumeration());
+        Mockito.stub(config.getServletContext()).toReturn(mock);
+        Mockito.stub(config.getInitParameterNames()).toReturn(Collections.emptyEnumeration());
+
+        //default to 1
+        filter.init(config);
+        assertEquals("1", filter.getDefaultVdbVersion());
+
+        //override
+        Mockito.stub(config.getInitParameter("explicit-vdb-version")).toReturn("false");
+        filter.init(config);
+        assertNull(filter.getDefaultVdbVersion());
+    }
+
+}