Update samples to new oslc-client API

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
OSLC · Nov 22, 2020 · b564fb9 · b564fb9
1 parent 67da579
commit b564fb9
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 94 deletions.
diff --git a/oslc4j-client-samples/pom.xml b/oslc4j-client-samples/pom.xml
@@ -10,7 +10,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <lyo.version>4.0.0.M2</lyo.version>
+        <lyo.version>4.0.0-SNAPSHOT</lyo.version>
     </properties>
 
     <dependencies>
@@ -51,7 +51,12 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.lyo.clients</groupId>
-            <artifactId>oslc4j-client</artifactId>
+            <artifactId>oslc-client</artifactId>
+            <version>${lyo.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.lyo.clients</groupId>
+            <artifactId>oslc-java-client-resources</artifactId>
             <version>${lyo.version}</version>
         </dependency>
 		<dependency>

diff --git a/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/CMSample.java b/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/CMSample.java
@@ -15,16 +15,6 @@
  *******************************************************************************/
 package org.eclipse.lyo.oslc4j.client.samples;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
@@ -34,17 +24,25 @@
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
-import org.eclipse.lyo.oslc4j.client.JEEFormAuthenticator;
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
-import org.eclipse.lyo.oslc4j.client.OslcClient;
-import org.eclipse.lyo.oslc4j.client.resources.ChangeRequest;
-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.OSLCConstants;
+import org.eclipse.lyo.client.OslcClient;
+import org.eclipse.lyo.client.oslc.resources.ChangeRequest;
+import org.eclipse.lyo.client.query.OslcQuery;
+import org.eclipse.lyo.client.query.OslcQueryParameters;
+import org.eclipse.lyo.client.query.OslcQueryResult;
 import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * Samples of accessing a generic ChangeManagement provider and running OSLC operations.
  * 

diff --git a/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/ERMSample.java b/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/ERMSample.java
@@ -30,6 +30,8 @@
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
 import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -40,27 +42,27 @@
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
-import org.eclipse.lyo.oslc4j.client.RootServicesHelper;
-import org.eclipse.lyo.oslc4j.client.exception.RootServicesException;
-import org.eclipse.lyo.oslc4j.client.JEEFormAuthenticator;
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
-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.oslc4j.client.resources.Requirement;
-import org.eclipse.lyo.oslc4j.client.resources.RequirementCollection;
-import org.eclipse.lyo.oslc4j.client.resources.RmConstants;
-import org.eclipse.lyo.oslc4j.client.resources.RmUtil;
+import org.eclipse.lyo.client.RootServicesHelper;
+import org.eclipse.lyo.client.exception.RootServicesException;
+import org.eclipse.lyo.client.JEEFormAuthenticator;
+import org.eclipse.lyo.client.OSLCConstants;
+import org.eclipse.lyo.client.OslcClient;
+import org.eclipse.lyo.client.query.OslcQuery;
+import org.eclipse.lyo.client.query.OslcQueryParameters;
+import org.eclipse.lyo.client.query.OslcQueryResult;
+import org.eclipse.lyo.client.oslc.resources.Requirement;
+import org.eclipse.lyo.client.oslc.resources.RequirementCollection;
+import org.eclipse.lyo.client.oslc.resources.RmConstants;
+import org.eclipse.lyo.client.resources.RmUtil;
 import org.eclipse.lyo.oslc4j.core.OSLC4JUtils;
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.eclipse.lyo.oslc4j.core.model.Property;
 import org.eclipse.lyo.oslc4j.core.model.ResourceShape;
 import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
-
-
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 
 /**
@@ -189,7 +191,7 @@ public static void main(String[] args) throws ParseException {
 
 				// Decorate the PrimaryText
 				primaryText = "My Primary Text";
-				org.w3c.dom.Element obj = RmUtil.convertStringToHTML(primaryText);
+				org.w3c.dom.Element obj = convertStringToHTML(primaryText);
 				requirement.getExtendedProperties().put(RmConstants.PROPERTY_PRIMARY_TEXT, obj);
 
 				requirement.setDescription("Created By EclipseLyo");
@@ -431,6 +433,17 @@ public static void main(String[] args) throws ParseException {
 
 	}
 
+	private static Element convertStringToHTML(String primaryText) {
+		try {
+			Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+			Element divElement = document.createElementNS(RmConstants.NAMESPACE_URI_XHTML, "div");
+			divElement.setTextContent(primaryText);
+			return divElement;
+		} catch (ParserConfigurationException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
 	private static void processPagedQueryResults(OslcQueryResult result, OslcClient client, boolean asJavaObjects) {
 		int page = 1;
 		//For now, just show first 5 pages

diff --git a/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/ETMSample.java b/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/ETMSample.java
@@ -18,47 +18,47 @@
  *******************************************************************************/
 package org.eclipse.lyo.oslc4j.client.samples;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URI;
-import java.util.logging.Level;
-
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.http.HttpHeaders;
+import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
-import org.eclipse.lyo.oslc4j.client.JEEFormAuthenticator;
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
-import org.eclipse.lyo.oslc4j.client.OslcClient;
-import org.eclipse.lyo.oslc4j.client.RootServicesHelper;
-import org.eclipse.lyo.oslc4j.client.exception.RootServicesException;
-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.oslc4j.client.resources.TestCase;
-import org.eclipse.lyo.oslc4j.client.resources.TestResult;
+import org.eclipse.lyo.client.JEEFormAuthenticator;
+import org.eclipse.lyo.client.OSLCConstants;
+import org.eclipse.lyo.client.OslcClient;
+import org.eclipse.lyo.client.RootServicesHelper;
+import org.eclipse.lyo.client.exception.RootServicesException;
+import org.eclipse.lyo.client.oslc.resources.TestCase;
+import org.eclipse.lyo.client.oslc.resources.TestResult;
+import org.eclipse.lyo.client.query.OslcQuery;
+import org.eclipse.lyo.client.query.OslcQueryParameters;
+import org.eclipse.lyo.client.query.OslcQueryResult;
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.model.OslcMediaType;
 import org.glassfish.jersey.apache.connector.ApacheClientProperties;
 import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Response;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URI;
+
 /**
  * Samples of logging in to IBM Enterprise Test Manager and running OSLC operations
  *
@@ -113,16 +113,22 @@ public static void main(String[] args) throws ParseException {
 			// Fixes Invalid cookie header: ... Invalid 'expires' attribute: Thu, 01 Dec 1994 16:00:00 GMT
 			clientConfig.property(ApacheClientProperties.REQUEST_CONFIG, RequestConfig.custom()
 					.setCookieSpec(CookieSpecs.STANDARD)
+//					.setProxy(new HttpHost("localhost", 12345))
 					.build());
 			clientConfig.register(MultiPartFeature.class);
 			ClientBuilder clientBuilder = ClientBuilder.newBuilder();
 			clientBuilder.withConfig(clientConfig);
 
 			// Setup SSL support to ignore self-assigned SSL certificates - for testing only!!
-		    SSLContextBuilder sslContextBuilder = new SSLContextBuilder();
-		    sslContextBuilder.loadTrustMaterial(TrustSelfSignedStrategy.INSTANCE);
-		    clientBuilder.sslContext(sslContextBuilder.build());
-		    clientBuilder.hostnameVerifier(NoopHostnameVerifier.INSTANCE);
+//		    SSLContextBuilder sslContextBuilder = new SSLContextBuilder();
+//		    sslContextBuilder.loadTrustMaterial(TrustSelfSignedStrategy.INSTANCE);
+//			logger.warn("Self-signed TLS cert trust enabled");
+//
+////			sslContextBuilder.loadTrustMaterial((chain, authType) -> true); // WARNING! Only use with mitmproxy
+////			logger.warn("MITM Proxy TLS cert trust enabled");
+//
+//			clientBuilder.sslContext(sslContextBuilder.build());
+//		    clientBuilder.hostnameVerifier(NoopHostnameVerifier.INSTANCE);
 
 		    // IBM jazz-apps use JEE Form based authentication
 		    clientBuilder.register(new JEEFormAuthenticator(webContextUrl, userId, password));

diff --git a/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/EWMSample.java b/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/EWMSample.java
@@ -40,15 +40,15 @@
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
-import org.eclipse.lyo.oslc4j.client.RootServicesHelper;
-import org.eclipse.lyo.oslc4j.client.exception.RootServicesException;
-import org.eclipse.lyo.oslc4j.client.JEEFormAuthenticator;
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
-import org.eclipse.lyo.oslc4j.client.OslcClient;
-import org.eclipse.lyo.oslc4j.client.resources.ChangeRequest;
-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.RootServicesHelper;
+import org.eclipse.lyo.client.exception.RootServicesException;
+import org.eclipse.lyo.client.JEEFormAuthenticator;
+import org.eclipse.lyo.client.OSLCConstants;
+import org.eclipse.lyo.client.OslcClient;
+import org.eclipse.lyo.client.oslc.resources.ChangeRequest;
+import org.eclipse.lyo.client.query.OslcQuery;
+import org.eclipse.lyo.client.query.OslcQueryParameters;
+import org.eclipse.lyo.client.query.OslcQueryResult;
 import org.eclipse.lyo.oslc4j.core.model.AllowedValues;
 import org.eclipse.lyo.oslc4j.core.model.CreationFactory;
 import org.eclipse.lyo.oslc4j.core.model.Link;

diff --git a/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/RMSample.java b/oslc4j-client-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/RMSample.java
@@ -24,13 +24,13 @@
 
 import org.apache.http.HttpStatus;
 import javax.ws.rs.core.Response;
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
-import org.eclipse.lyo.oslc4j.client.OslcClient;
-import org.eclipse.lyo.oslc4j.client.resources.Requirement;
-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.oslc4j.client.resources.Requirement;
+import org.eclipse.lyo.client.OSLCConstants;
+import org.eclipse.lyo.client.OslcClient;
+import org.eclipse.lyo.client.oslc.resources.Requirement;
+import org.eclipse.lyo.client.query.OslcQuery;
+import org.eclipse.lyo.client.query.OslcQueryParameters;
+import org.eclipse.lyo.client.query.OslcQueryResult;
+import org.eclipse.lyo.client.oslc.resources.Requirement;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.Options;

diff --git a/...les/src/main/java/org/eclipse/lyo/oslc4j/client/samples/automation/AutomationAdapter.java b/...les/src/main/java/org/eclipse/lyo/oslc4j/client/samples/automation/AutomationAdapter.java
@@ -41,16 +41,16 @@
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.vocabulary.RDF;
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
-import org.eclipse.lyo.oslc4j.client.OslcClient;
-import org.eclipse.lyo.oslc4j.client.RootServicesHelper;
-import org.eclipse.lyo.oslc4j.client.exception.ResourceNotFoundException;
-import org.eclipse.lyo.oslc4j.client.exception.RootServicesException;
-import org.eclipse.lyo.oslc4j.client.resources.AutomationConstants;
-import org.eclipse.lyo.oslc4j.client.resources.AutomationPlan;
-import org.eclipse.lyo.oslc4j.client.resources.AutomationRequest;
-import org.eclipse.lyo.oslc4j.client.resources.AutomationResult;
-import org.eclipse.lyo.oslc4j.client.resources.TestScript;
+import org.eclipse.lyo.client.OSLCConstants;
+import org.eclipse.lyo.client.OslcClient;
+import org.eclipse.lyo.client.RootServicesHelper;
+import org.eclipse.lyo.client.exception.ResourceNotFoundException;
+import org.eclipse.lyo.client.exception.RootServicesException;
+import org.eclipse.lyo.client.oslc.resources.AutomationConstants;
+import org.eclipse.lyo.client.oslc.resources.AutomationPlan;
+import org.eclipse.lyo.client.oslc.resources.AutomationRequest;
+import org.eclipse.lyo.client.oslc.resources.AutomationResult;
+import org.eclipse.lyo.client.oslc.resources.TestScript;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcDescription;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcName;
 import org.eclipse.lyo.oslc4j.core.annotation.OslcNamespace;

diff --git a/.../org/eclipse/lyo/oslc4j/client/samples/automation/AutomationRequestCanceledException.java b/.../org/eclipse/lyo/oslc4j/client/samples/automation/AutomationRequestCanceledException.java
@@ -15,7 +15,7 @@
  *******************************************************************************/
 package org.eclipse.lyo.oslc4j.client.samples.automation;
 
-import org.eclipse.lyo.oslc4j.client.resources.AutomationRequest;
+import org.eclipse.lyo.client.oslc.resources.AutomationRequest;
 
 /**
  * An exception thrown when an AutomationRequest has been canceled

diff --git a/...s/src/main/java/org/eclipse/lyo/oslc4j/client/samples/automation/ETMAutomationSample.java b/...s/src/main/java/org/eclipse/lyo/oslc4j/client/samples/automation/ETMAutomationSample.java
@@ -33,12 +33,12 @@
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
-import org.eclipse.lyo.oslc4j.client.JEEFormAuthenticator;
-import org.eclipse.lyo.oslc4j.client.OslcClient;
-import org.eclipse.lyo.oslc4j.client.resources.AutomationConstants;
-import org.eclipse.lyo.oslc4j.client.resources.AutomationRequest;
-import org.eclipse.lyo.oslc4j.client.resources.AutomationResult;
-import org.eclipse.lyo.oslc4j.client.resources.ParameterInstance;
+import org.eclipse.lyo.client.JEEFormAuthenticator;
+import org.eclipse.lyo.client.OslcClient;
+import org.eclipse.lyo.client.oslc.resources.AutomationConstants;
+import org.eclipse.lyo.client.oslc.resources.AutomationRequest;
+import org.eclipse.lyo.client.oslc.resources.AutomationResult;
+import org.eclipse.lyo.client.oslc.resources.ParameterInstance;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.HttpUrlConnectorProvider;

diff --git a/...main/java/org/eclipse/lyo/oslc4j/client/samples/automation/IAutomationRequestHandler.java b/...main/java/org/eclipse/lyo/oslc4j/client/samples/automation/IAutomationRequestHandler.java
@@ -15,8 +15,8 @@
  *******************************************************************************/
 package org.eclipse.lyo.oslc4j.client.samples.automation;
 
-import org.eclipse.lyo.oslc4j.client.resources.AutomationRequest;
-import org.eclipse.lyo.oslc4j.client.resources.AutomationResult;
+import org.eclipse.lyo.client.oslc.resources.AutomationRequest;
+import org.eclipse.lyo.client.oslc.resources.AutomationResult;
 
 public interface IAutomationRequestHandler {
 

diff --git a/...nt-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/automation/IConstants.java b/...nt-samples/src/main/java/org/eclipse/lyo/oslc4j/client/samples/automation/IConstants.java
@@ -17,7 +17,7 @@
 
 import javax.xml.namespace.QName;
 
-import org.eclipse.lyo.oslc4j.client.OSLCConstants;
+import org.eclipse.lyo.client.OSLCConstants;
 
 public interface IConstants {