Skip to content

Commit

Permalink
correct import order
Browse files Browse the repository at this point in the history
  • Loading branch information
canemacchina committed Sep 21, 2017
1 parent 1984ae0 commit 7c46d14
Show file tree
Hide file tree
Showing 84 changed files with 398 additions and 226 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
package io.growingabit.app.controllers;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;

import org.apache.commons.lang3.StringUtils;

import com.googlecode.objectify.NotFoundException;

import io.growingabit.app.exceptions.SignupStageExecutionException;
import io.growingabit.app.model.BitcoinAddress;
import io.growingabit.app.model.InvitationCodeSignupStage;
Expand All @@ -16,17 +30,6 @@
import io.growingabit.backoffice.dao.InvitationDao;
import io.growingabit.backoffice.model.Invitation;
import io.growingabit.jersey.annotations.Secured;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.commons.lang3.StringUtils;

@Secured
@Path("api/v1/me")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
package io.growingabit.app.controllers;

import io.growingabit.app.dao.StudentEmailSignupStageDao;
import io.growingabit.app.model.StudentEmailSignupStage;
import io.growingabit.app.model.User;
import io.growingabit.jersey.annotations.Secured;
import java.io.UnsupportedEncodingException;

import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;

import org.apache.commons.codec.binary.Base64;
import org.joda.time.DateTime;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;

import io.growingabit.app.dao.StudentEmailSignupStageDao;
import io.growingabit.app.model.StudentEmailSignupStage;
import io.growingabit.app.model.User;
import io.growingabit.jersey.annotations.Secured;

@Path("api/v1/verify/email/{verificationCode}")
public class VerificationEmailController {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
package io.growingabit.app.controllers;

import com.googlecode.objectify.Key;
import io.growingabit.app.dao.StudentPhoneSignupStageDao;
import io.growingabit.app.dao.UserDao;
import io.growingabit.app.model.StudentPhoneSignupStage;
import io.growingabit.app.model.User;
import io.growingabit.app.utils.auth.Auth0UserProfile;
import io.growingabit.jersey.annotations.Secured;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.SecurityContext;

import org.joda.time.DateTime;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;

import com.googlecode.objectify.Key;

import io.growingabit.app.dao.StudentPhoneSignupStageDao;
import io.growingabit.app.dao.UserDao;
import io.growingabit.app.model.StudentPhoneSignupStage;
import io.growingabit.app.model.User;
import io.growingabit.app.utils.auth.Auth0UserProfile;
import io.growingabit.jersey.annotations.Secured;

@Secured
@Path("api/v1/verify/phone/{verificationCode}")
public class VerificationPhoneController {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.common.base.Preconditions;
import com.googlecode.objectify.Key;
import com.googlecode.objectify.ObjectifyService;

import io.growingabit.app.model.User;
import io.growingabit.common.dao.BaseDao;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package io.growingabit.app.model;

import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;

import com.google.common.base.Preconditions;

public class BitcoinAddress {

private String address;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.googlecode.objectify.annotation.Cache;
import com.googlecode.objectify.annotation.Entity;

import io.growingabit.app.exceptions.SignupStageExecutionException;
import io.growingabit.app.model.base.ReferenceSignupStage;
import io.growingabit.app.signup.executors.SignupStageExecutor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package io.growingabit.app.model;

import com.google.common.base.Preconditions;
import io.growingabit.app.utils.SecureStringGenerator;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.routines.EmailValidator;
import org.joda.time.DateTime;

import com.google.common.base.Preconditions;

import io.growingabit.app.utils.SecureStringGenerator;

public class StudentConfirmationEmail {

private static final int VERIFICATION_CODE_LENGTH = 30;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package io.growingabit.app.model;

import com.google.common.base.Preconditions;
import io.growingabit.app.utils.SecureStringGenerator;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;

import com.google.common.base.Preconditions;

import io.growingabit.app.utils.SecureStringGenerator;

public class StudentConfirmationPhone {

private static final int VERIFICATION_CODE_LENGTH = 8;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package io.growingabit.app.model;

import com.google.common.base.Preconditions;
import com.googlecode.objectify.annotation.Ignore;
import org.apache.commons.lang3.StringUtils;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;

import com.google.common.base.Preconditions;
import com.googlecode.objectify.annotation.Ignore;

public class StudentData {

@Ignore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.googlecode.objectify.annotation.Cache;
import com.googlecode.objectify.annotation.Entity;

import io.growingabit.app.exceptions.SignupStageExecutionException;
import io.growingabit.app.model.base.SignupStage;
import io.growingabit.app.signup.executors.SignupStageExecutor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.googlecode.objectify.annotation.Cache;
import com.googlecode.objectify.annotation.Entity;

import io.growingabit.app.exceptions.SignupStageExecutionException;
import io.growingabit.app.model.base.SignupStage;
import io.growingabit.app.signup.executors.SignupStageExecutor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.googlecode.objectify.annotation.Cache;
import com.googlecode.objectify.annotation.Entity;

import io.growingabit.app.exceptions.SignupStageExecutionException;
import io.growingabit.app.model.base.SignupStage;
import io.growingabit.app.signup.executors.SignupStageExecutor;
Expand Down
11 changes: 7 additions & 4 deletions pwa-backend/src/main/java/io/growingabit/app/model/User.java
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
package io.growingabit.app.model;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import org.apache.commons.lang3.StringUtils;

import com.googlecode.objectify.Ref;
import com.googlecode.objectify.annotation.Cache;
import com.googlecode.objectify.annotation.Entity;
import com.googlecode.objectify.annotation.Id;
import com.googlecode.objectify.annotation.Load;

import io.growingabit.app.model.base.SignupStage;
import io.growingabit.app.utils.Settings;
import io.growingabit.common.model.BaseModel;
import io.gsonfire.annotations.ExposeMethodResult;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;

@Entity
@Cache
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.common.base.Preconditions;
import com.googlecode.objectify.annotation.Cache;
import com.googlecode.objectify.annotation.Entity;

import io.growingabit.app.exceptions.SignupStageExecutionException;
import io.growingabit.app.model.base.SignupStage;
import io.growingabit.app.signup.executors.SignupStageExecutor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
package io.growingabit.app.model.base;

import org.apache.commons.lang3.StringUtils;

import com.googlecode.objectify.Key;
import com.googlecode.objectify.annotation.Id;
import com.googlecode.objectify.annotation.Ignore;
import com.googlecode.objectify.annotation.Parent;

import io.growingabit.app.exceptions.SignupStageExecutionException;
import io.growingabit.app.model.User;
import io.growingabit.app.signup.executors.SignupStageExecutor;
import io.growingabit.app.utils.Settings;
import io.growingabit.common.model.BaseModel;
import io.growingabit.objectify.annotations.Required;
import io.gsonfire.annotations.ExposeMethodResult;
import org.apache.commons.lang3.StringUtils;

public abstract class SignupStage<T> extends BaseModel {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.googlecode.objectify.Key;
import com.googlecode.objectify.ObjectifyService;
import com.googlecode.objectify.VoidWork;

import io.growingabit.app.dao.InvitationCodeSignupStageDao;
import io.growingabit.app.exceptions.SignupStageExecutionException;
import io.growingabit.app.model.InvitationCodeSignupStage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.appengine.api.taskqueue.QueueFactory;
import com.google.appengine.api.taskqueue.TaskOptions;
import com.google.common.base.Preconditions;

import io.growingabit.app.dao.StudentDataSignupStageDao;
import io.growingabit.app.dao.StudentEmailSignupStageDao;
import io.growingabit.app.dao.StudentPhoneSignupStageDao;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package io.growingabit.app.tasks.deferred;

import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;

import com.google.appengine.api.taskqueue.DeferredTask;

import io.growingabit.app.dao.StudentEmailSignupStageDao;
import io.growingabit.app.model.StudentEmailSignupStage;
import io.growingabit.mail.MailService;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;

public class DeferredTaskSendVerificationEmail implements DeferredTask {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
package io.growingabit.app.tasks.deferred;

import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;

import com.google.appengine.api.taskqueue.DeferredTask;
import com.googlecode.objectify.NotFoundException;
import com.twilio.Twilio;
import com.twilio.rest.api.v2010.account.Message;
import com.twilio.type.PhoneNumber;

import io.growingabit.app.dao.StudentPhoneSignupStageDao;
import io.growingabit.app.model.StudentConfirmationPhone;
import io.growingabit.app.model.StudentPhoneSignupStage;
import io.growingabit.app.utils.Settings;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;

public class DeferredTaskSendVerificationSMS implements DeferredTask {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;

import org.apache.commons.lang3.StringUtils;

public class BitcoinAddressValidator {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package io.growingabit.app.utils;

import java.io.IOException;
import java.util.Arrays;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;

import com.google.api.client.googleapis.extensions.appengine.auth.oauth2.AppIdentityCredential;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.urlshortener.Urlshortener;
import com.google.api.services.urlshortener.UrlshortenerScopes;
import com.google.common.base.Preconditions;
import java.io.IOException;
import java.util.Arrays;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;

public class GoogleUrlShortenerService extends Urlshortener {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package io.growingabit.app.utils;

import com.google.common.base.Preconditions;
import java.security.SecureRandom;
import java.util.Random;

import com.google.common.base.Preconditions;

public class SecureStringGenerator {

// only use unreserved url characters
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package io.growingabit.app.utils;

import com.google.common.base.Preconditions;
import java.net.URL;
import java.nio.charset.StandardCharsets;

import javax.xml.ws.WebServiceException;

import org.apache.commons.configuration2.CombinedConfiguration;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.FileBasedConfiguration;
Expand All @@ -14,6 +15,8 @@
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.tree.OverrideCombiner;

import com.google.common.base.Preconditions;

public class Settings {

public static final String DEFAULT_PROPERTIES_NAME = "default.properties";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.security.Principal;
import java.util.Set;

import javax.ws.rs.core.SecurityContext;

public class Authorizer implements SecurityContext {
Expand Down Expand Up @@ -37,4 +38,4 @@ public boolean isSecure() {
public String getAuthenticationScheme() {
return SecurityContext.FORM_AUTH;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

import io.gsonfire.GsonFireBuilder;

public class GsonFactory {
Expand Down
Loading

0 comments on commit 7c46d14

Please sign in to comment.