Skip to content
Permalink
Browse files
Automatic code style formatting
  • Loading branch information
haarli committed Oct 31, 2018
1 parent 0f9b7d1 commit cd955260d45c9da81673066f95cee10b58f3916c
Showing 545 changed files with 58,270 additions and 58,448 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

90 pom.xml
@@ -1,4 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>imeji</artifactId>
<groupId>org.imeji</groupId>
@@ -87,7 +89,7 @@
<repositories>
<!-- <repository> <id>central</id> <url>http://central</url> <releases>
<enabled>true</enabled> </releases> <snapshots> <enabled>true</enabled> </snapshots>
</repository> -->
</repository> -->
<repository>
<id>prime-repo</id>
<name>Prime Technology Maven Repository</name>
@@ -246,6 +248,27 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.7.0</version>
<configuration>
<compilerSource>1.8</compilerSource>
<compilerCompliance>1.8</compilerCompliance>
<compilerTargetPlatform>1.8</compilerTargetPlatform>
<lineEnding>LF</lineEnding>
<encoding>UTF-8</encoding>
<configFile>${project.parent.basedir}/java-google-style-custom.xml</configFile>
</configuration>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
@@ -281,6 +304,22 @@
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<versionRange>[0.4,)</versionRange>
<goals>
<goals>
<goal>format</goal>
<goal>default</goal>
</goals>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
@@ -332,21 +371,21 @@
<artifactId>prettyfaces-jsf2</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.11.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.1</version>
</dependency>
<!-- USED during compile, e.g. javax.mail -->
<dependency>
<groupId>javax</groupId>
@@ -501,11 +540,8 @@
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch-analysis-icu</artifactId>
<version>2.7.0</version>
</dependency>-->
<!-- <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch-analysis-icu</artifactId>
<version>2.7.0</version> </dependency> -->
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
@@ -539,9 +575,13 @@
<phase>install</phase>
<configuration>
<tasks>
<delete quiet="true" file="${tomcat.webapps}/${project.warName}.war" />
<delete quiet="true" dir="${tomcat.webapps}/${project.warName}" />
<copy overwrite="true" file="${project.build.directory}/${project.warName}.war" tofile="${tomcat.webapps}/${project.warName}.war" />
<delete quiet="true"
file="${tomcat.webapps}/${project.warName}.war" />
<delete quiet="true"
dir="${tomcat.webapps}/${project.warName}" />
<copy overwrite="true"
file="${project.build.directory}/${project.warName}.war"
tofile="${tomcat.webapps}/${project.warName}.war" />
</tasks>
</configuration>
<goals>
@@ -1,16 +1,15 @@
package de.mpg.imeji.exceptions;


public class AlreadyExistsException extends ImejiException {
private static final long serialVersionUID = 4123172628332785494L;

/**
* Constructor for a new {@link AlreadyExistsException}
*
* @param message
*/
public AlreadyExistsException(String message) {
super(message);
}
private static final long serialVersionUID = 4123172628332785494L;

/**
* Constructor for a new {@link AlreadyExistsException}
*
* @param message
*/
public AlreadyExistsException(String message) {
super(message);
}

}
@@ -1,18 +1,16 @@
package de.mpg.imeji.exceptions;


public class AuthenticationError extends ImejiException {
private static final long serialVersionUID = 6128275500671470459L;
private static final long serialVersionUID = 6128275500671470459L;

public static final String USER_MUST_BE_LOGGED_IN =
"Need to be logged-in to proceed with the operation.";
public static final String USER_MUST_BE_LOGGED_IN = "Need to be logged-in to proceed with the operation.";

/**
* Constructor for HTTP 401 Unauthorized
*/
public AuthenticationError(String message) {
super(message);
minimizeStacktrace();
}
/**
* Constructor for HTTP 401 Unauthorized
*/
public AuthenticationError(String message) {
super(message);
minimizeStacktrace();
}

}
@@ -4,18 +4,18 @@
*
*/
public class BadRequestException extends ImejiException {
private static final long serialVersionUID = -3721639144291667847L;
private static final long serialVersionUID = -3721639144291667847L;

/**
* Constructor for HTTP 400 BadRequest
*/
/**
* Constructor for HTTP 400 BadRequest
*/

public BadRequestException(String message) {
super(message);
}
public BadRequestException(String message) {
super(message);
}

public BadRequestException(String message, Throwable e) {
super(message, e);
}
public BadRequestException(String message, Throwable e) {
super(message, e);
}

}
@@ -3,26 +3,27 @@
import java.util.Arrays;

public class ImejiException extends Exception {
private static final long serialVersionUID = -1024323233094119992L;
private static final long serialVersionUID = -1024323233094119992L;

public ImejiException() {
super();
}
public ImejiException() {
super();
}

public ImejiException(String message) {
super(message);
}
public ImejiException(String message) {
super(message);
}

public ImejiException(String message, Throwable e) {
super(message, e);
}
public ImejiException(String message, Throwable e) {
super(message, e);
}

/**
* When the Exception message is clear enough, we don't need the full stacktrace. This method
* shows only the message plus the first element of the stacktrace
*/
protected void minimizeStacktrace() {
setStackTrace(Arrays.copyOf(getStackTrace(), 5));
}
/**
* When the Exception message is clear enough, we don't need the full
* stacktrace. This method shows only the message plus the first element of the
* stacktrace
*/
protected void minimizeStacktrace() {
setStackTrace(Arrays.copyOf(getStackTrace(), 5));
}

}
@@ -7,9 +7,9 @@
*
*/
public class InactiveAuthenticationError extends AuthenticationError {
private static final long serialVersionUID = 7976153766697083425L;
private static final long serialVersionUID = 7976153766697083425L;

public InactiveAuthenticationError(String message) {
super(message);
}
public InactiveAuthenticationError(String message) {
super(message);
}
}
@@ -1,20 +1,18 @@
package de.mpg.imeji.exceptions;



/**
*
*/
public class NotAllowedError extends ImejiException {
private static final long serialVersionUID = -3504946406047760565L;
public static final String NOT_ALLOWED = "Not enough permissions to proceed with the operation.";
private static final long serialVersionUID = -3504946406047760565L;
public static final String NOT_ALLOWED = "Not enough permissions to proceed with the operation.";

/**
* Constructor for HTTP 403 Forbidden
*/
public NotAllowedError(String message) {
super(message);
minimizeStacktrace();
}
/**
* Constructor for HTTP 403 Forbidden
*/
public NotAllowedError(String message) {
super(message);
minimizeStacktrace();
}

}
@@ -1,13 +1,12 @@
package de.mpg.imeji.exceptions;


public class NotFoundException extends ImejiException {

private static final long serialVersionUID = -6006945139992063194L;
private static final long serialVersionUID = -6006945139992063194L;

public NotFoundException(String message) {
super(message, null);
// minimizeStacktrace();
}
public NotFoundException(String message) {
super(message, null);
// minimizeStacktrace();
}

}
@@ -5,18 +5,17 @@

public class NotSupportedMethodException extends ImejiException {

/**
*
*/
private static final long serialVersionUID = -474498315581861322L;

/**
*
*/
private static final long serialVersionUID = -474498315581861322L;
public NotSupportedMethodException() {
super("Method is not supported.");
}

public NotSupportedMethodException() {
super("Method is not supported.");
}

public NotSupportedMethodException(String extraMesg) {
super("Method is not supported: " + extraMesg);
}
public NotSupportedMethodException(String extraMesg) {
super("Method is not supported: " + extraMesg);
}

}
@@ -5,11 +5,11 @@
*/
public class QuotaExceededException extends ImejiException {

private static final long serialVersionUID = 145948204335897106L;
private static final long serialVersionUID = 145948204335897106L;

public QuotaExceededException(String message) {
super(message);
minimizeStacktrace();
}
public QuotaExceededException(String message) {
super(message);
minimizeStacktrace();
}

}
@@ -2,14 +2,14 @@

public class TypeNotAllowedException extends Exception {

private static final long serialVersionUID = 8649579301777694188L;
private static final long serialVersionUID = 8649579301777694188L;

public TypeNotAllowedException(String message) {
super(message);
}
public TypeNotAllowedException(String message) {
super(message);
}

public TypeNotAllowedException(String message, Throwable e) {
super(message, e);
}
public TypeNotAllowedException(String message, Throwable e) {
super(message, e);
}

}

0 comments on commit cd95526

Please sign in to comment.