WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/utils/sync/SimpleSyncClient.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.FileTime;
 import net.minidev.json.JSONObject;
 import net.minidev.json.parser.JSONParser;
 public final class SimpleSyncClient extends HTTPClient {
-    static protected final long getLong(final Object o) {
+    protected static final long getLong(final Object o) {
         return ((Number) o).longValue();
+    }
-    static protected final Instant getInstant(final Object o) {
+    protected static final Instant getInstant(final Object o) {
         return Instant.ofEpochMilli(getLong(o));
+    }
-    static protected abstract class BaseAttrs {
+    public static abstract class BaseAttrs implements Serializable {
         private final String path;
         private final String name;
         private final Instant lastModified;
         protected BaseAttrs(final String path, final String name, final Instant lastModified) {
         public String toString() {
             return this.getClass().getSimpleName() + " '" + this.getName() + "'";
+        }
+    }
-    static public final class DirAttrs extends BaseAttrs {
+    public static final class DirAttrs extends BaseAttrs {
-        static protected DirAttrs fromJSON(final String path, final JSONArray array) {
+        protected static DirAttrs fromJSON(final String path, final JSONArray array) {
             return new DirAttrs(path, (String) array.get(0), getInstant(array.get(1)));
+        }
         protected DirAttrs(final String path, String name, Instant lastModified) {
             super(path, name, lastModified);
+        }
+    }
-    static public final class FileAttrs extends BaseAttrs {
+    public static final class FileAttrs extends BaseAttrs {
-        static protected FileAttrs fromJSON(final String path, final JSONArray array) {
+        protected static FileAttrs fromJSON(final String path, final JSONArray array) {
             return new FileAttrs(path, (String) array.get(0), getInstant(array.get(2)), getLong(array.get(1)), (String) array.get(3));
+        }
         private final long size;
         private final String sha256;
         public String toString() {
             return super.toString() + " of size " + getSize();
+        }
+    }
-    static public final class DirContent {
+    public static final class DirContent {
         private final String path;
         private final JSONObject json;
         protected DirContent(final String path, JSONObject json) {
             super();
             return new DirContent(path, (JSONObject) p.parse(in));
+        }
+    }
     @FunctionalInterface
-    static public interface FileConsumer {
+    public static interface FileConsumer {
         public void accept(FileAttrs attrs, InputStream fileStream) throws IOException;
+    }
-    static private final Set<Integer> GETFILE_OK_CODES = CollectionUtils.createSet(200, 404);
+    private static final Set<Integer> GETFILE_OK_CODES = CollectionUtils.createSet(200, 404);
     public Response getFile(final String path, final String fileName, final FileConsumer fileConsumer) throws IOException {
         if (path == null) {
             throw new IllegalArgumentException("null path");
+        }
+            }
+        }
         return res;
+    }
+    public Integer getCounter(final String key) throws IOException {
+        if (key == null) {
+            throw new IllegalArgumentException("null key");
+        }
+        final HttpsURLConnection con = openConnection("/getCounter");
+        send(con, NetUtils.urlEncode("key", key), false);
+        final Response res = checkResponseCode(con, GETFILE_OK_CODES);
+        if (res.getCode() == 200) {
+            byte[] bytes = new byte[20];
+            try (final InputStream in = getInputStream(con)) {
+                int r = in.read(bytes);
+                String str = new String(bytes, 0, r);
+                return Integer.parseInt(str);
+            }
+        }
+        return null;
+    }
     // ATTN contrary to other methods, the result isn't if the request was OK : it ignores
     // throwsException() and always throws. The return value is true if the file existed and was
     // saved.
     public boolean saveFile(final String path, final String fileName, final Path localFile) throws IOException {
         if (path == null) {
         final HttpsURLConnection con = openConnection("/delete");
         return checkResponseCode(send(con, NetUtils.urlEncode("rn", fileName, "rp", path), false));
+    }
     public final Response renameFile(final String path, final String fileName, final String newFileName) throws IOException {
-        return this.renameFile(path, fileName, null, newFileName);
+        return this.renameFile(path, fileName, path, newFileName);
+    }
     public final Response renameFile(final String path, final String fileName, final String newPath, final String newFileName) throws IOException {
         if (path == null) {
             throw new IllegalArgumentException("null path");
         con.setRequestProperty("X_SHA256", HashWriter.bytesToHex(newsha256));
         con.setRequestProperty("X-Last-Modified-ms", String.valueOf(localFile.lastModified()));
         return checkResponseCode(send(con, ba.toByteArray(), true));
+    }
+    public Response createDir(String path, String fileName) throws IOException {
+        if (path == null) {
+            throw new IllegalArgumentException("null path");
+        }
+        if (fileName == null) {
+            throw new IllegalArgumentException("null fileName");
+        }
+        final HttpsURLConnection con = openConnection("/mkdir");
+        return checkResponseCode(send(con, NetUtils.urlEncode("rn", fileName, "rp", path), false));
+    }
+}

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/sync/SimpleSyncClient.java @ 180 - Rev 180 → 182