deleted code: sending file to remote storage

This commit is contained in:
Sergey Linnik
2016-07-11 11:18:45 +03:00
parent 7298ec481c
commit aadac3cca6
10 changed files with 27 additions and 331 deletions

View File

@ -24,7 +24,6 @@ public class DocumentManager
private static HttpServletRequest request;
private static HttpServletResponse response;
private static final Map<String, String> CacheMap = new HashMap<>();
private static final String ExternalIPCacheKey = "ExternalIPCacheKey";
public static void Init(HttpServletRequest req, HttpServletResponse resp){
@ -175,12 +174,7 @@ public class DocumentManager
String filePath = serverPath + "/" + storagePath + "/" + hostAddress + "/" + URLEncoder.encode(fileName);
if (HaveExternalIP(filePath))
{
return filePath;
}
return GetExternalUri(filePath);
return filePath;
}
catch(Exception ex)
{
@ -202,63 +196,6 @@ public class DocumentManager
return serverPath + "/IndexServlet" + query;
}
public static Boolean HaveExternalIP(String filePath)
{
if(CacheMap.containsKey(ExternalIPCacheKey))
return Boolean.parseBoolean(CacheMap.get(ExternalIPCacheKey));
Boolean haveExternalIP = false;
try
{
String extension = FileUtility.GetFileExtension(filePath);
String internalExtension = GetInternalExtension(FileUtility.GetFileType(filePath));
Pair<Integer, String> res = ServiceConverter.GetConvertedUri(filePath, extension, internalExtension, UUID.randomUUID().toString(), false);
if(res != null)
{
haveExternalIP = true;
}
}
catch (Exception ex)
{
haveExternalIP = false;
}
CacheMap.put(ExternalIPCacheKey, haveExternalIP.toString());
return haveExternalIP;
}
public static String GetExternalUri(String localUri) throws Exception
{
String documentRevisionId = ServiceConverter.GenerateRevisionId(localUri);
if(CacheMap.containsKey(documentRevisionId))
return CacheMap.get(documentRevisionId);
try
{
URL url = new URL(localUri);
java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
InputStream inputStream = connection.getInputStream();
String contentType = connection.getContentType();
String externalUri = ServiceConverter.GetExternalUri(inputStream, inputStream.available(), contentType, documentRevisionId);
connection.disconnect();
CacheMap.put(documentRevisionId, externalUri);
return externalUri;
}
catch (Exception ex)
{
throw ex;
}
}
public static String GetInternalExtension(FileType fileType)
{
if(fileType.equals(FileType.Text))