- JDK 6: OCR Sample and detect HTTP and HTTPS

alegauss · alegauss · commit d3494a4677e1 · 2025-02-04T22:06:07.000-03:00
diff --git a/turing-jdk6/.gitignore b/turing-jdk6/.gitignore
@@ -1 +1,2 @@
 /.idea/
+/target/
diff --git a/turing-jdk6/turing-java-sdk-jdk6/pom.xml b/turing-jdk6/turing-java-sdk-jdk6/pom.xml
@@ -80,10 +80,25 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
-                        <phase>none</phase>
+                        <phase>package</phase>
                         <configuration>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>indexer</shadedClassifierName>
+                            <shadedClassifierName>all</shadedClassifierName>
+                            <minimizeJar>true</minimizeJar>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>module-info.class</exclude>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>META-INF/NOTICE</exclude>
+                                        <exclude>META-INF/LICENSE</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/ocr/TurFileAttributes.java b/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/ocr/TurFileAttributes.java
@@ -68,4 +68,17 @@ public Map<String, String> getMetadata() {
     public void setMetadata(Map<String, String> metadata) {
         this.metadata = metadata;
     }
+
+    @Override
+    public String toString() {
+        return "TurFileAttributes{" +
+                "content='" + content + '\'' +
+                ", name='" + name + '\'' +
+                ", title='" + title + '\'' +
+                ", extension='" + extension + '\'' +
+                ", size=" + size +
+                ", lastModified=" + lastModified +
+                ", metadata=" + metadata +
+                '}';
+    }
 }
diff --git a/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/ocr/TurFileSize.java b/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/ocr/TurFileSize.java
@@ -43,4 +43,13 @@ public float getMegaBytes() {
     public void setMegaBytes(float megaBytes) {
         this.megaBytes = megaBytes;
     }
+
+    @Override
+    public String toString() {
+        return "TurFileSize{" +
+                "bytes=" + bytes +
+                ", kiloBytes=" + kiloBytes +
+                ", megaBytes=" + megaBytes +
+                '}';
+    }
 }
diff --git a/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/ocr/TurOcr.java b/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/ocr/TurOcr.java
@@ -1,6 +1,5 @@
 package com.viglet.turing.client.ocr;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.viglet.turing.client.sn.TurSNServer;
 import com.viglet.turing.client.sn.utils.TurSNClientUtils;
@@ -10,9 +9,10 @@
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.*;
+import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;
-import java.util.List;
+import java.net.URLConnection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -36,6 +36,7 @@ public class TurOcr {
     public static final String TWO_HYPHENS = "--";
     public static final String BOUNDARY = "*****";
     public static final String MULTIPART = "multipart/form-data";
+    public static final String HTTPS = "https";
 
     public TurFileAttributes processUrl(TurSNServer turServer, URI url) {
         return getTurFileAttributes(turServer,
@@ -52,42 +53,43 @@ public TurFileAttributes processFile(TurSNServer turServer, File file) {
     private TurFileAttributes getTurFileAttributes(TurSNServer turServer, JSONObject jsonObject,
                                                    String endpoint) {
         try {
-            HttpsURLConnection httpsURLConnection = getHttpsURLConnection(turServer, endpoint);
-            httpsURLConnection.setRequestProperty(CONTENT_TYPE_HEADER, APPLICATION_JSON);
-            OutputStream os = httpsURLConnection.getOutputStream();
+            URLConnection urlConnection = getURLConnection(turServer, endpoint);
+            urlConnection.setRequestProperty(CONTENT_TYPE_HEADER, APPLICATION_JSON);
+            OutputStream os = urlConnection.getOutputStream();
             byte[] input = jsonObject.toString().getBytes(UTF_8);
             os.write(input, 0, input.length);
 
-            new ObjectMapper().readValue(TurClientUtils.openConnectionAndRequest(httpsURLConnection),
-                    new TypeReference<List<String>>() {
-                    });
+            return new ObjectMapper().readValue(TurClientUtils.openConnectionAndRequest(urlConnection),
+                    TurFileAttributes.class);
         } catch (IOException e) {
             logger.log(Level.SEVERE, e.getMessage(), e);
         }
         return null;
     }
 
-    private static HttpsURLConnection getHttpsURLConnection(TurSNServer turServer, String endpoint) throws IOException {
-        URL url = new URL(null, endpoint, new sun.net.www.protocol.https.Handler());
-        HttpsURLConnection httpsURLConnection = (HttpsURLConnection) url.openConnection();
-        httpsURLConnection.setSSLSocketFactory(new TLSSocketConnectionFactory());
-        httpsURLConnection.setRequestProperty(ACCEPT_HEADER, APPLICATION_JSON);
-        httpsURLConnection.setRequestProperty(ACCEPT_ENCODING_HEADER, UTF_8);
-        httpsURLConnection.setRequestProperty(CONNECTION, KEEP_ALIVE);
-        httpsURLConnection.setRequestProperty(CACHE_CONTROL, NO_CACHE);
-        httpsURLConnection.setRequestMethod(POST);
-        httpsURLConnection.setUseCaches(false);
-        httpsURLConnection.setDoOutput(true);
-        TurSNClientUtils.basicAuth(httpsURLConnection, turServer.getCredentials());
+    private static URLConnection getURLConnection(TurSNServer turServer, String endpoint) throws IOException {
+        URL url = TurClientUtils.getURL(endpoint);
+        URLConnection urlConnection = url.openConnection();
+        if (endpoint.toLowerCase().startsWith(HTTPS)) {
+            ((HttpsURLConnection) urlConnection).setSSLSocketFactory(new TLSSocketConnectionFactory());
+        }
+        urlConnection.setRequestProperty(ACCEPT_HEADER, APPLICATION_JSON);
+        urlConnection.setRequestProperty(ACCEPT_ENCODING_HEADER, UTF_8);
+        urlConnection.setRequestProperty(CONNECTION, KEEP_ALIVE);
+        urlConnection.setRequestProperty(CACHE_CONTROL, NO_CACHE);
+        ((HttpURLConnection) urlConnection).setRequestMethod(POST);
+        urlConnection.setUseCaches(false);
+        urlConnection.setDoOutput(true);
+        TurSNClientUtils.basicAuth(urlConnection, turServer.getCredentials());
 
-        return httpsURLConnection;
+        return urlConnection;
     }
 
     private TurFileAttributes getTurFileAttributes(TurSNServer turServer, File file,
                                                    String endpoint) {
         String attachmentFileName = file.getName();
         try {
-            HttpsURLConnection httpsURLConnection = getHttpsURLConnection(turServer, endpoint);
+            URLConnection httpsURLConnection = getURLConnection(turServer, endpoint);
             httpsURLConnection.setRequestProperty(
                     CONTENT_TYPE_HEADER, MULTIPART + ";boundary=" + BOUNDARY);
             DataOutputStream request = new DataOutputStream(
diff --git a/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/ocr/sample/TurClientOcrSample.java b/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/ocr/sample/TurClientOcrSample.java
@@ -1,5 +1,7 @@
 package com.viglet.turing.client.ocr.sample;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.viglet.turing.client.ocr.TurFileAttributes;
 import com.viglet.turing.client.ocr.TurOcr;
 import com.viglet.turing.client.sn.TurSNServer;
@@ -8,24 +10,24 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.util.logging.Logger;
 
 public class TurClientOcrSample {
-    private static final Logger logger = Logger.getLogger(TurClientOcrSample.class.getName());
-    public static void main(String[] args) throws MalformedURLException {
+    public static void main(String[] args) throws MalformedURLException, JsonProcessingException {
         if (args.length == 4) {
             String turingUrl = args[0];
             String username = args[1];
             String password = args[2];
             String fileUrl = args[3];
             TurSNServer turSNServer = new TurSNServer(new URL(turingUrl),
                     new TurUsernamePasswordCredentials(username, password));
-            logger.fine("--- Ocr Url");
+            System.out.println("--- Ocr Url");
             TurOcr turOcr = new TurOcr();
             TurFileAttributes turFileAttributes = turOcr.processUrl(turSNServer, URI.create(fileUrl));
-            logger.fine(turFileAttributes.toString());
+            if (turFileAttributes != null) {
+                System.out.println( new ObjectMapper().writer().withDefaultPrettyPrinter().writeValueAsString(turFileAttributes));
+            }
         } else {
-            logger.fine("Parameters: turingUrl apiKey fileUrl");
+            System.out.println("Parameters: turingUrl username password fileUrl");
         }
     }
 }
diff --git a/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/sn/TurSNServer.java b/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/sn/TurSNServer.java
@@ -16,13 +16,9 @@
 
 package com.viglet.turing.client.sn;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
+import java.net.*;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -104,6 +100,8 @@ public class TurSNServer {
 	private static final String ACCEPT_ENCODING_HEADER = "Accept-Encoding";
 	
 	private static final String APPLICATION_JSON = "application/json";
+	public static final String HTTPS = "https";
+	public static final String POST = "POST";
 
 	private String turSNServer;
 
@@ -229,33 +227,34 @@ public List<String> getLatestSearches(int rows) {
 			TurSNClientUtils.addURLParameter(turingURL, TurSNParamType.ROWS, Integer.toString(rows));
 
 			if (this.getCredentials() != null) {
-				URL url = new URL(null, turingURL.toString(), new sun.net.www.protocol.https.Handler());
-				HttpsURLConnection httpsURLConnection = (HttpsURLConnection) url.openConnection();
-
-				httpsURLConnection.setSSLSocketFactory(new TLSSocketConnectionFactory());
-				httpsURLConnection.setRequestProperty(ACCEPT_HEADER, APPLICATION_JSON);
-				httpsURLConnection.setRequestProperty(CONTENT_TYPE_HEADER, APPLICATION_JSON);
-				httpsURLConnection.setRequestProperty(ACCEPT_ENCODING_HEADER, UTF_8);
+				URL url = TurClientUtils.getURL(turingURL.toString());
+				URLConnection urlConnection = url.openConnection();
+				if (turingURL.toString() .startsWith(HTTPS)) {
+					((HttpsURLConnection) urlConnection).setSSLSocketFactory(new TLSSocketConnectionFactory());
+				}
+				urlConnection.setRequestProperty(ACCEPT_HEADER, APPLICATION_JSON);
+				urlConnection.setRequestProperty(CONTENT_TYPE_HEADER, APPLICATION_JSON);
+				urlConnection.setRequestProperty(ACCEPT_ENCODING_HEADER, UTF_8);
 
-				httpsURLConnection.setRequestMethod("POST");
-				httpsURLConnection.setDoOutput(true);
+				((HttpURLConnection) urlConnection).setRequestMethod(POST);
+				urlConnection.setDoOutput(true);
 
-				TurSNClientUtils.basicAuth(httpsURLConnection, this.getCredentials());
+				TurSNClientUtils.basicAuth(urlConnection, this.getCredentials());
 				
 				if (this.getTurSNSitePostParams() != null && this.getTurSNSitePostParams().getUserId() != null) {
 					TurSNSearchLatestRequestBean turSNSearchLatestRequestBean = new TurSNSearchLatestRequestBean();
 					turSNSearchLatestRequestBean.setUserId(this.getTurSNSitePostParams().getUserId());
 					String jsonResult = new ObjectMapper().writeValueAsString(turSNSearchLatestRequestBean);
 
-					OutputStream os = httpsURLConnection.getOutputStream();
+					OutputStream os = urlConnection.getOutputStream();
 					byte[] input = jsonResult.getBytes(UTF_8);
 					os.write(input, 0, input.length);
 				}
 
 				
 
 				logger.fine(String.format("Viglet Turing Request: %s", turingURL.toString()));
-				return new ObjectMapper().readValue(TurClientUtils.openConnectionAndRequest(httpsURLConnection),
+				return new ObjectMapper().readValue(TurClientUtils.openConnectionAndRequest(urlConnection),
 						new TypeReference<List<String>>() {
 						});
 			}
@@ -413,15 +412,15 @@ private TurSNDocumentList setResultsResponse(TurSNSiteSearchBean turSNSiteSearch
 	private HttpsURLConnection preparePostRequest(URL turingURL) {
 		HttpsURLConnection httpsURLConnection = null;
 		try {
-			URL url = new URL(null, turingURL.toString(), new sun.net.www.protocol.https.Handler());
+			URL url = TurClientUtils.getURL(turingURL.toString());
 			httpsURLConnection = (HttpsURLConnection) url.openConnection();
 
 			httpsURLConnection.setSSLSocketFactory(new TLSSocketConnectionFactory());
 			httpsURLConnection.setRequestProperty(ACCEPT_HEADER, APPLICATION_JSON);
 			httpsURLConnection.setRequestProperty(CONTENT_TYPE_HEADER, APPLICATION_JSON);
 			httpsURLConnection.setRequestProperty(ACCEPT_ENCODING_HEADER, UTF_8);
 
-			httpsURLConnection.setRequestMethod("POST");
+			httpsURLConnection.setRequestMethod(POST);
 			httpsURLConnection.setDoOutput(true);
 
 			TurSNClientUtils.basicAuth(httpsURLConnection, this.getCredentials());
diff --git a/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/sn/utils/TurSNClientUtils.java b/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/sn/utils/TurSNClientUtils.java
@@ -16,23 +16,17 @@
 package com.viglet.turing.client.sn.utils;
 
 import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.net.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import javax.net.ssl.HttpsURLConnection;
-import java.net.URL;
-import java.net.URLDecoder;
 import javax.xml.bind.DatatypeConverter;
 
 import com.viglet.turing.client.sn.credentials.TurUsernamePasswordCredentials;
-import java.io.UnsupportedEncodingException;
 
 
 /**
@@ -44,15 +38,15 @@
  *
  */
 public class TurSNClientUtils {
-	private static Logger logger = Logger.getLogger(TurSNClientUtils.class.getName());
-	public static void basicAuth(HttpsURLConnection httpsURLConnection, TurUsernamePasswordCredentials credentials) {
+	private static final Logger logger = Logger.getLogger(TurSNClientUtils.class.getName());
+	public static void basicAuth(URLConnection urlConnection, TurUsernamePasswordCredentials credentials) {
 		if (credentials != null && credentials.getUsername() != null) {
 			String auth = String.format("%s:%s", credentials.getUsername(), credentials.getPassword());
 			try{ 
 				String encodedAuth = DatatypeConverter.printBase64Binary
 			     	     (auth.getBytes("UTF-8"));
 				String authHeader = "Basic " + encodedAuth;
-				httpsURLConnection.setRequestProperty("Authorization", authHeader);
+				urlConnection.setRequestProperty("Authorization", authHeader);
 			} catch (UnsupportedEncodingException e) {
 				logger.log(Level.SEVERE, e.getMessage(), e);
 			}
diff --git a/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/utils/TurClientUtils.java b/turing-jdk6/turing-java-sdk-jdk6/src/main/java/com/viglet/turing/client/utils/TurClientUtils.java
@@ -1,44 +1,53 @@
 package com.viglet.turing.client.utils;
 
-import javax.net.ssl.HttpsURLConnection;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class TurClientUtils {
     private static final Logger logger = Logger.getLogger(TurClientUtils.class.getName());
-    public static String openConnectionAndRequest(HttpsURLConnection httpsURLConnection) {
-        return executeQueryRequest(httpsURLConnection);
+
+    public static URL getURL(String endpoint) throws MalformedURLException {
+        return (endpoint.toLowerCase().startsWith("https")) ?
+                new URL(null, endpoint, new sun.net.www.protocol.https.Handler()) :
+                new URL(null, endpoint);
+    }
+    public static String openConnectionAndRequest(URLConnection urlConnection) {
+        return executeQueryRequest(urlConnection);
     }
 
-    private static String executeQueryRequest(HttpsURLConnection httpsURLConnection) {
+    private static String executeQueryRequest(URLConnection urlConnection) {
         try {
-            int responseCode = httpsURLConnection.getResponseCode();
-            return getTurResponseBody(httpsURLConnection, responseCode);
+            int responseCode = ((HttpURLConnection) urlConnection).getResponseCode();
+            return getTurResponseBody(urlConnection, responseCode);
         } catch (IOException e) {
             logger.log(Level.SEVERE, e.getMessage(), e);
         }
         return null;
     }
 
-    public static String getTurResponseBody(HttpsURLConnection httpsURLConnection, int result) throws IOException {
+    public static String getTurResponseBody(URLConnection urlConnection, int result) throws IOException {
         StringBuilder responseBody = new StringBuilder();
         if (result == 200) {
-            BufferedReader br = new BufferedReader(new InputStreamReader(httpsURLConnection.getInputStream()));
+            BufferedReader br = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
             String strCurrentLine;
             while ((strCurrentLine = br.readLine()) != null) {
                 responseBody.append(strCurrentLine);
             }
         } else {
-            BufferedReader br = new BufferedReader(new InputStreamReader(httpsURLConnection.getErrorStream()));
+            BufferedReader br = new BufferedReader(new InputStreamReader(((HttpURLConnection) urlConnection).getErrorStream()));
             String strCurrentLine;
             while ((strCurrentLine = br.readLine()) != null) {
                 responseBody.append(strCurrentLine);
             }
         }
-        httpsURLConnection.disconnect();
+        ((HttpURLConnection) urlConnection).disconnect();
         return responseBody.toString();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,13 @@ public float getMegaBytes() {`
`43`	`43`	`public void setMegaBytes(float megaBytes) {`
`44`	`44`	`this.megaBytes = megaBytes;`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ @Override`
	`48`	`+ public String toString() {`
	`49`	`+ return "TurFileSize{" +`
	`50`	`+ "bytes=" + bytes +`
	`51`	`+ ", kiloBytes=" + kiloBytes +`
	`52`	`+ ", megaBytes=" + megaBytes +`
	`53`	`+ '}';`
	`54`	`+ }`
`46`	`55`	`}`