Move new client to a simpler package

eclipse · Nov 9, 2020 · 47af0d6 · 47af0d6
1 parent 9f4a012
commit 47af0d6
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 53 deletions.
diff --git a/...clipse/lyo/oslc4j/client/IOslcClient.java → ...a/org/eclipse/lyo/client/IOslcClient.java b/...clipse/lyo/oslc4j/client/IOslcClient.java → ...a/org/eclipse/lyo/client/IOslcClient.java
@@ -20,7 +20,7 @@
  *     Samuel Padgett                  - handle any redirect status code
  *     Jad El-khoury                   - Migrate client from Wink to implementation-independent JAX-RS 2.0
  *******************************************************************************/
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 import java.util.Map;
 import javax.ws.rs.client.Client;
@@ -77,7 +77,7 @@ public interface IOslcClient {
     public Response getResource (String url, Map<String, String> requestHeaders, String mediaType, String configurationContext);
 
    public Response getResource (String url, Map<String, String> requestHeaders, String mediaType, boolean handleRedirects);
-   
+
    public Response getResource (String url, Map<String, String> requestHeaders, String mediaType, String configurationContext, boolean handleRedirects);
 
 	/**

diff --git a/...o/oslc4j/client/JEEFormAuthenticator.java → ...ipse/lyo/client/JEEFormAuthenticator.java b/...o/oslc4j/client/JEEFormAuthenticator.java → ...ipse/lyo/client/JEEFormAuthenticator.java
@@ -10,7 +10,7 @@
  * http://www.eclipse.org/org/documents/edl-v10.php.
  */
 
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -31,8 +31,6 @@
 import javax.ws.rs.core.Response;
 
 import org.apache.http.HttpStatus;
-import org.apache.http.client.ClientProtocolException;
-import org.eclipse.lyo.oslc4j.core.annotation.OslcSchema;
 
 /**
  * A filter that can be registered in order to non-preemptively handle JEE Form

diff --git a/...ipse/lyo/oslc4j/client/OSLCConstants.java → ...org/eclipse/lyo/client/OSLCConstants.java b/...ipse/lyo/oslc4j/client/OSLCConstants.java → ...org/eclipse/lyo/client/OSLCConstants.java
@@ -16,7 +16,7 @@
  *    Samuel Padgett  - deprecate constants for non-existent terms
  *******************************************************************************/
 
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 /**
  * General OSLC constants

diff --git a/...eclipse/lyo/oslc4j/client/OslcClient.java → ...va/org/eclipse/lyo/client/OslcClient.java b/...eclipse/lyo/oslc4j/client/OslcClient.java → ...va/org/eclipse/lyo/client/OslcClient.java
@@ -20,7 +20,7 @@
  *     Samuel Padgett                  - handle any redirect status code
  *     Jad El-khoury                   - Migrate client from Wink to implementation-independent JAX-RS 2.0
  *******************************************************************************/
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -31,7 +31,6 @@
 import java.util.Map;
 
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;

diff --git a/.../lyo/oslc4j/client/OslcClientBuilder.java → ...eclipse/lyo/client/OslcClientBuilder.java b/.../lyo/oslc4j/client/OslcClientBuilder.java → ...eclipse/lyo/client/OslcClientBuilder.java
@@ -1,4 +1,4 @@
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 import javax.ws.rs.client.ClientBuilder;
 

diff --git a/.../lyo/oslc4j/client/OslcClientFactory.java → ...eclipse/lyo/client/OslcClientFactory.java b/.../lyo/oslc4j/client/OslcClientFactory.java → ...eclipse/lyo/client/OslcClientFactory.java
@@ -1,11 +1,11 @@
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 public class OslcClientFactory {
-    
+
     static public OslcOAuthClientBuilder oslcOAuthClientBuilder() {
         return new OslcOAuthClientBuilder();
     }
-    
+
     static public OslcClientBuilder oslcClientBuilder() {
         return new OslcClientBuilder();
     }

diff --git a/...se/lyo/oslc4j/client/OslcOAuthClient.java → ...g/eclipse/lyo/client/OslcOAuthClient.java b/...se/lyo/oslc4j/client/OslcOAuthClient.java → ...g/eclipse/lyo/client/OslcOAuthClient.java
@@ -16,7 +16,7 @@
  *     Samuel Padgett      - don't re-register JAX-RS applications for every request
  *     Samuel Padgett      - add two-legged OAuth support
  *******************************************************************************/
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -65,7 +65,7 @@ public OslcOAuthClient(
             UnderlyingHttpClient underlyingHttpClient) {
 
         oauthAccessor = accessor;
-       
+
         oauthRealmName = "Jazz";
         // Change if a different name was detected
         if (!StringUtils.isEmpty(realm)) {
@@ -84,7 +84,7 @@ public OslcOAuthClient(
     public OslcClient getOslcClient() {
         return oslcClient;
     }
-	
+
     private Map<String, String> appendAuthorizationHeader(String url, String httpMethod, Map<String, String> requestHeaders) throws IOException, OAuthException, URISyntaxException {
         if (requestHeaders == null) {
             requestHeaders = new HashMap<>();
@@ -123,7 +123,7 @@ private boolean performedOAuthNegotiation() {
     public Optional<String> performOAuthNegotiation(String callbackURL) throws IOException, OAuthException, URISyntaxException {
         return performOAuthNegotiationInternal(false, callbackURL);
     }
-    
+
     private Optional<String> performOAuthNegotiationInternal(boolean restart, String callbackURL) throws IOException, OAuthException, URISyntaxException {
         //No request token yet, get the request token and throw exception to redirect for authorization.
         if (oauthAccessor.requestToken == null) {
@@ -134,10 +134,10 @@ public HttpClient getHttpClient(URL url) {
             });
             OAuthMessage message = client.getRequestTokenResponse(oauthAccessor, OAuthMessage.GET, null);
 
-            String userAuthorizationURL = oauthAccessor.consumer.serviceProvider.userAuthorizationURL + 
+            String userAuthorizationURL = oauthAccessor.consumer.serviceProvider.userAuthorizationURL +
             "?oauth_token=" + oauthAccessor.requestToken +
             "&oauth_callback="+URLEncoder.encode(callbackURL, "UTF-8");
-            
+
             return Optional.of(userAuthorizationURL);
         }
 
@@ -195,7 +195,7 @@ public Response getResource(String url, Map<String, String> requestHeaders, Stri
     public Response getResource(String url, Map<String, String> requestHeaders, String mediaType, String configurationContext) {
         return this.getResource(url, requestHeaders, mediaType,configurationContext, true);
     }
-    
+
     @Override
     public Response getResource(String url, Map<String, String> requestHeaders, String mediaType, boolean handleRedirects) {
         return this.getResource(url, requestHeaders, mediaType, null, handleRedirects);
@@ -211,7 +211,7 @@ public Response getResource(String url, Map<String, String> requestHeaders, Stri
         }
         return oslcClient.getResource(url, headers, mediaType,configurationContext, handleRedirects);
     }
-    
+
     @Override
     public Response deleteResource(String url) {
         throw new UnsupportedOperationException();

diff --git a/...oslc4j/client/OslcOAuthClientBuilder.java → ...se/lyo/client/OslcOAuthClientBuilder.java b/...oslc4j/client/OslcOAuthClientBuilder.java → ...se/lyo/client/OslcOAuthClientBuilder.java
@@ -1,4 +1,4 @@
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 import javax.ws.rs.client.ClientBuilder;
 
@@ -19,7 +19,7 @@ public class OslcOAuthClientBuilder {
     private String consumerSecret;
 
     private String oauthRealmName;
-    
+
     private ClientBuilder clientBuilder;
     private UnderlyingHttpClient underlyingHttpClient;
 
@@ -45,9 +45,9 @@ public OslcOAuthClientBuilder setFromRootService(RootServicesHelper rootService)
     }
 
     public OslcOAuthClientBuilder setOAuthServiceProvider(String requestTokenURL, String authorizationTokenURL, String accessTokenURL) {
-        this.requestTokenURL = requestTokenURL;  
+        this.requestTokenURL = requestTokenURL;
         this.authorizationTokenURL = authorizationTokenURL;
-        this.accessTokenURL = accessTokenURL;  
+        this.accessTokenURL = accessTokenURL;
         return this;
     }
 

diff --git a/.../oslc4j/client/RootServicesConstants.java → ...pse/lyo/client/RootServicesConstants.java b/.../oslc4j/client/RootServicesConstants.java → ...pse/lyo/client/RootServicesConstants.java
@@ -14,7 +14,7 @@
  *    Michael Fiedler - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 /**
  * Constants for Jazz rootservices entries

diff --git a/...lyo/oslc4j/client/RootServicesHelper.java → ...clipse/lyo/client/RootServicesHelper.java b/...lyo/oslc4j/client/RootServicesHelper.java → ...clipse/lyo/client/RootServicesHelper.java
@@ -16,14 +16,13 @@
  *     Samuel Padgett      - add request consumer key and OAuth approval module URLs
  *     Samuel Padgett      - handle trailing '/' in baseUrl
  *******************************************************************************/
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;

diff --git a/...o/oslc4j/client/UnderlyingHttpClient.java → ...ipse/lyo/client/UnderlyingHttpClient.java b/...o/oslc4j/client/UnderlyingHttpClient.java → ...ipse/lyo/client/UnderlyingHttpClient.java
@@ -1,4 +1,4 @@
-package org.eclipse.lyo.oslc4j.client;
+package org.eclipse.lyo.client;
 
 import javax.ws.rs.client.Client;
 import org.apache.http.client.HttpClient;

diff --git a/...yo/oslc4j/client/resources/OslcQuery.java → ...lipse/lyo/client/resources/OslcQuery.java b/...yo/oslc4j/client/resources/OslcQuery.java → ...lipse/lyo/client/resources/OslcQuery.java
@@ -10,13 +10,13 @@
  * http://www.eclipse.org/org/documents/edl-v10.php.
  */
 
-package org.eclipse.lyo.oslc4j.client.resources;
+package org.eclipse.lyo.client.resources;
 
 
 import javax.ws.rs.core.Response;
 
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
-import org.eclipse.lyo.oslc4j.client.OslcClient;
+import org.eclipse.lyo.client.OslcClient;
+import org.eclipse.lyo.client.OSLCConstants;
 
 import javax.ws.rs.client.WebTarget;
 

diff --git a/...client/resources/OslcQueryParameters.java → ...client/resources/OslcQueryParameters.java b/...client/resources/OslcQueryParameters.java → ...client/resources/OslcQueryParameters.java
@@ -13,7 +13,7 @@
  *
  *     Michael Fiedler     - initial API and implementation
  *******************************************************************************/
-package org.eclipse.lyo.oslc4j.client.resources;
+package org.eclipse.lyo.client.resources;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

diff --git a/...c4j/client/resources/OslcQueryResult.java → ...lyo/client/resources/OslcQueryResult.java b/...c4j/client/resources/OslcQueryResult.java → ...lyo/client/resources/OslcQueryResult.java
@@ -16,7 +16,7 @@
  *     Samuel Padgett   - support setting member property
  *     Samuel Padgett   - preserve member property on call to getNext()
  *******************************************************************************/
-package org.eclipse.lyo.oslc4j.client.resources;
+package org.eclipse.lyo.client.resources;
 
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
@@ -28,7 +28,7 @@
 
 import javax.ws.rs.core.Response;
 
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
+import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
 import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
 import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper;

diff --git a/...e/lyo/oslc4j/client/resources/RmUtil.java → .../eclipse/lyo/client/resources/RmUtil.java b/...e/lyo/oslc4j/client/resources/RmUtil.java → .../eclipse/lyo/client/resources/RmUtil.java
@@ -14,12 +14,12 @@
  *     Gabriel Ruelas       - initial API and implementation
  *     Carlos A Arreola     - initial API and implementation
  *******************************************************************************/
-package org.eclipse.lyo.oslc4j.client.resources;
+package org.eclipse.lyo.client.resources;
 
 import net.oauth.OAuthException;
+import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.client.exception.ResourceNotFoundException;
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
-import org.eclipse.lyo.oslc4j.client.OslcClient;
+import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.oslc4j.core.model.CreationFactory;
 import org.eclipse.lyo.oslc4j.core.model.ResourceShape;
 import org.eclipse.lyo.oslc4j.core.model.Service;

diff --git a/...yo/oslc4j/client/test/OslcClientTest.java → ...lipse/lyo/client/test/OslcClientTest.java b/...yo/oslc4j/client/test/OslcClientTest.java → ...lipse/lyo/client/test/OslcClientTest.java
@@ -14,19 +14,11 @@
  *     Samuel Padgett                  - initial API and implementation
  *     Samuel Padgett                  - set timeout on postInvalidOslcResource()
  *******************************************************************************/
-package org.eclipse.lyo.oslc4j.client.test;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
+package org.eclipse.lyo.client.test;
 
 import javax.ws.rs.core.Response;
-import javax.xml.namespace.QName;
-
-import javax.ws.rs.ClientErrorException;
 
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
-import org.eclipse.lyo.oslc4j.client.OslcClient;
-import org.junit.Ignore;
+import org.eclipse.lyo.client.OslcClient;
 import org.junit.Test;
 import static org.assertj.core.api.Assertions.*;
 

diff --git a/...lc4j/client/test/OslcQueryResultTest.java → .../lyo/client/test/OslcQueryResultTest.java b/...lc4j/client/test/OslcQueryResultTest.java → .../lyo/client/test/OslcQueryResultTest.java
@@ -15,21 +15,20 @@
  *     Samuel Padgett - test member property on call to OslcQueryResult.getNext()
  *     Samuel Padgett - remove previous test as it causes problems in our Hudson builds
  *******************************************************************************/
-package org.eclipse.lyo.oslc4j.client.test;
+package org.eclipse.lyo.client.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 
 import java.io.InputStream;
-import java.net.MalformedURLException;
 
 
 import javax.ws.rs.core.Response;
 
-import org.eclipse.lyo.oslc4j.client.OslcClient;
-import org.eclipse.lyo.oslc4j.client.resources.OslcQuery;
-import org.eclipse.lyo.oslc4j.client.resources.OslcQueryParameters;
-import org.eclipse.lyo.oslc4j.client.resources.OslcQueryResult;
+import org.eclipse.lyo.client.OslcClient;
+import org.eclipse.lyo.client.resources.OslcQuery;
+import org.eclipse.lyo.client.resources.OslcQueryParameters;
+import org.eclipse.lyo.client.resources.OslcQueryResult;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;