From 02723131139806c761539a42a5fa80b68ecadee8 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 29 Jun 2017 14:03:04 +0300
Subject: project structure: split server into jdbc + web

---
 .../src/main/java/com/juick/util/TagUtils.java     | 25 -----------
 .../src/main/java/com/juick/util/UserUtils.java    | 49 ----------------------
 .../src/main/java/com/juick/util/WebUtils.java     | 45 --------------------
 3 files changed, 119 deletions(-)
 delete mode 100644 juick-server/src/main/java/com/juick/util/TagUtils.java
 delete mode 100644 juick-server/src/main/java/com/juick/util/UserUtils.java
 delete mode 100644 juick-server/src/main/java/com/juick/util/WebUtils.java

(limited to 'juick-server/src/main/java/com/juick/util')

diff --git a/juick-server/src/main/java/com/juick/util/TagUtils.java b/juick-server/src/main/java/com/juick/util/TagUtils.java
deleted file mode 100644
index fec59f29..00000000
--- a/juick-server/src/main/java/com/juick/util/TagUtils.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.juick.util;
-
-import com.juick.Tag;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Created by aalexeev on 11/13/16.
- */
-public class TagUtils {
-    private TagUtils() {
-        throw new IllegalStateException();
-    }
-
-    public static String toString(final List<Tag> tags) {
-        if (CollectionUtils.isEmpty(tags))
-            return StringUtils.EMPTY;
-
-        return tags.stream().map(t -> " *" + t.getName())
-                .collect(Collectors.joining());
-    }
-}
diff --git a/juick-server/src/main/java/com/juick/util/UserUtils.java b/juick-server/src/main/java/com/juick/util/UserUtils.java
deleted file mode 100644
index 3d78b5b5..00000000
--- a/juick-server/src/main/java/com/juick/util/UserUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.juick.util;
-
-import com.juick.User;
-import com.juick.server.security.entities.AnonymousUser;
-import com.juick.server.security.entities.JuickUser;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import java.util.Random;
-
-/**
- * Created by aalexeev on 11/14/16.
- */
-public class UserUtils {
-    private UserUtils() {
-        throw new IllegalStateException();
-    }
-
-    private static final String ABCDEF = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-    public static String generateHash(final int len) {
-        Random rnd = new Random();
-        StringBuilder sb = new StringBuilder(len);
-        for (int i = 0; i < len; i++) {
-            sb.append(ABCDEF.charAt(rnd.nextInt(ABCDEF.length())));
-        }
-        return sb.toString();
-    }
-
-    public static Authentication getAuthentication() {
-        return SecurityContextHolder.getContext().getAuthentication();
-    }
-
-    public static Object getPrincipal(final Authentication authentication) {
-        return authentication == null ? null : authentication.getPrincipal();
-    }
-
-    public static User getCurrentUser() {
-        Object principal = getPrincipal(getAuthentication());
-
-        if (principal instanceof JuickUser)
-            return ((JuickUser) principal).getUser();
-
-        if (principal instanceof User)
-            return (User) principal;
-
-        return AnonymousUser.INSTANCE;
-    }
-}
diff --git a/juick-server/src/main/java/com/juick/util/WebUtils.java b/juick-server/src/main/java/com/juick/util/WebUtils.java
deleted file mode 100644
index 8e240c5d..00000000
--- a/juick-server/src/main/java/com/juick/util/WebUtils.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.juick.util;
-
-import java.util.regex.Pattern;
-
-/**
- * Created by aalexeev on 11/28/16.
- */
-public class WebUtils {
-    private WebUtils() {
-        throw new IllegalStateException();
-    }
-
-    private static final Pattern USER_NAME_PATTERN = Pattern.compile("[a-zA-Z-_\\d]{2,16}");
-
-    private static final Pattern POST_NUMBER_PATTERN = Pattern.compile("-?\\d+");
-
-    private static final Pattern JID_PATTERN = Pattern.compile("^[a-zA-Z0-9\\\\-\\\\_\\\\@\\\\.]{6,64}$");
-
-
-    public static boolean isPostNumber(final String aString) {
-        return aString != null && POST_NUMBER_PATTERN.matcher(aString).matches();
-    }
-
-    public static boolean isNotPostNumber(final String aString) {
-        return !isPostNumber(aString);
-    }
-
-    public static boolean isUserName(final String aString) {
-        return aString != null && USER_NAME_PATTERN.matcher(aString).matches();
-    }
-
-    public static boolean isNotUserName(final String aString) {
-        return !isUserName(aString);
-    }
-
-    public static boolean isJid(final String aString) {
-        return aString != null && JID_PATTERN.matcher(aString).matches();
-    }
-
-    public static boolean isNotJid(final String aString) {
-        return !isJid(aString);
-    }
-
-
-}
-- 
cgit v1.2.3