[GEOS-8824] Factoring out a single user authentication converter

src/community/security/oauth2-geonode/src/main/resources/applicationContext.xml

@@ -22,14 +22,7 @@
 
 	<!-- OAuth2 Security Extension -->
 		<bean id="geoNodeOAuth2TokenServices" class="org.geoserver.security.oauth2.services.GeoNodeTokenServices">
-			<property name="accessTokenConverter">
-				<bean class="org.geoserver.security.oauth2.services.GeoNodeAccessTokenConverter">
-					<property name="userTokenConverter">
-						<bean class="org.geoserver.security.oauth2.services.GeoNodeUserAuthenticationConverter">
-						</bean>
-					</property>
-				</bean>
-			</property>
+
 		</bean>
 
 		<bean id="geoNodeOAuth2AuthenticationProvider"

src/community/security/oauth2-geonode/src/test/java/org/geoserver/security/oauth2/SpringWiringTest.java

@@ -0,0 +1,32 @@
+/*
+ * (c) 2018 Open Source Geospatial Foundation - all rights reserved
+ * This code is licensed under the GPL 2.0 license, available at the root
+ * application directory.
+ *
+ */
+
+/*
+ * (c) 2018 Open Source Geospatial Foundation - all rights reserved
+ * This code is licensed under the GPL 2.0 license, available at the root
+ * application directory.
+ *
+ */
+
+package org.geoserver.security.oauth2;
+
+import org.geoserver.data.test.SystemTestData;
+import org.geoserver.test.GeoServerSystemTestSupport;
+import org.junit.Test;
+
+public class SpringWiringTest extends GeoServerSystemTestSupport {
+
+    @Override
+    protected void setUpTestData(SystemTestData testData) throws Exception {
+        // no test data to setup, this is a smoke test
+    }
+
+    @Test
+    public void testStartup() {
+        // nothing to do, just checks the beans are properly wired
+    }
+}

src/community/security/oauth2-github/src/main/resources/applicationContext.xml

@@ -23,16 +23,6 @@
 	<!-- OAuth2 Security Extension -->
 	<bean id="githubOAuth2TokenServices"
 		class="org.geoserver.security.oauth2.services.GitHubTokenServices">
-		<property name="accessTokenConverter">
-			<bean
-				class="org.geoserver.security.oauth2.services.GitHubAccessTokenConverter">
-				<property name="userTokenConverter">
-					<bean
-						class="org.geoserver.security.oauth2.services.GitHubUserAuthenticationConverter">
-					</bean>
-				</property>
-			</bean>
-		</property>
 	</bean>
 
 	<bean id="githubOAuth2AuthenticationProvider"

src/community/security/oauth2-github/src/test/java/org/geoserver/security/oauth2/SpringWiringTest.java

@@ -0,0 +1,32 @@
+/*
+ * (c) 2018 Open Source Geospatial Foundation - all rights reserved
+ * This code is licensed under the GPL 2.0 license, available at the root
+ * application directory.
+ *
+ */
+
+/*
+ * (c) 2018 Open Source Geospatial Foundation - all rights reserved
+ * This code is licensed under the GPL 2.0 license, available at the root
+ * application directory.
+ *
+ */
+
+package org.geoserver.security.oauth2;
+
+import org.geoserver.data.test.SystemTestData;
+import org.geoserver.test.GeoServerSystemTestSupport;
+import org.junit.Test;
+
+public class SpringWiringTest extends GeoServerSystemTestSupport {
+
+    @Override
+    protected void setUpTestData(SystemTestData testData) throws Exception {
+        // no test data to setup, this is a smoke test
+    }
+
+    @Test
+    public void testStartup() {
+        // nothing to do, just checks the beans are properly wired
+    }
+}

src/community/security/oauth2-google/src/main/resources/applicationContext.xml

@@ -23,17 +23,6 @@
 	<!-- OAuth2 Security Extension -->
 	<bean id="googleOAuth2TokenServices"
 		class="org.geoserver.security.oauth2.services.GoogleTokenServices">
-		<property name="accessTokenConverter">
-			<bean
-				class="org.geoserver.security.oauth2.services.GoogleAccessTokenConverter">
-				<property name="userTokenConverter">
-					<bean
-						class="org.geoserver.security.oauth2.services.GoogleUserAuthenticationConverter">
-						<constructor-arg value="email" />
-					</bean>
-				</property>
-			</bean>
-		</property>
 	</bean>
 
 	<bean id="googleOAuth2AuthenticationProvider"

src/community/security/oauth2-google/src/test/java/org/geoserver/security/oauth2/SpringWiringTest.java

@@ -0,0 +1,25 @@
+/*
+ * (c) 2018 Open Source Geospatial Foundation - all rights reserved
+ * This code is licensed under the GPL 2.0 license, available at the root
+ * application directory.
+ *
+ */
+
+package org.geoserver.security.oauth2;
+
+import org.geoserver.data.test.SystemTestData;
+import org.geoserver.test.GeoServerSystemTestSupport;
+import org.junit.Test;
+
+public class SpringWiringTest extends GeoServerSystemTestSupport {
+
+    @Override
+    protected void setUpTestData(SystemTestData testData) throws Exception {
+        // no test data to setup, this is a smoke test
+    }
+
+    @Test
+    public void testStartup() {
+        // nothing to do, just checks the beans are properly wired
+    }
+}