Skip to content

Commit

Permalink
Formatted sources and poms
Browse files Browse the repository at this point in the history 
java -jar ~/Downloads/google-java-format-1.18.1-all-deps.jar -i $(find . -type f -name "*.java" | grep ".*/src/.*java")
mvn com.github.ekryd.sortpom:sortpom-maven-plugin:3.3.0:sort -Dsort.predefinedSortOrder=recommended_2008_06 -Dsort.createBackupFile=false  -Pall
  • Loading branch information
@velo
velo committed Feb 13, 2024
1 parent 0447356 commit 9f70294
Show file tree
Hide file tree
Showing 2,154 changed files with 137,703 additions and 138,040 deletions.
350 changes: 171 additions & 179 deletions pom.xml
View file

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions querydsl-ant-test/src/test/Test.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package test;
import java.math.BigDecimal;

import com.mysema.query.annotations.QueryEntity;

import java.math.BigDecimal;

@QueryEntity
public class Test {

private String property;
private String property;

private int intProperty;
private int intProperty;

private BigDecimal bigDecimal;
private BigDecimal bigDecimal;
}
58 changes: 29 additions & 29 deletions querydsl-apt/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<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>

<parent>
Expand All @@ -11,10 +11,10 @@

<groupId>com.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<packaging>jar</packaging>
<name>Querydsl - APT support</name>
<description>APT based Source code generation for Querydsl</description>
<url>${project.homepage}</url>
<packaging>jar</packaging>

<scm>
<connection>${project.checkout}</connection>
Expand Down Expand Up @@ -45,7 +45,7 @@
<version>2.2.3</version>
<scope>provided</scope>
</dependency>

<!-- provided -->
<dependency>
<groupId>org.datanucleus</groupId>
Expand All @@ -60,7 +60,7 @@
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
Expand All @@ -78,26 +78,26 @@
<version>${morphia.version}</version>
<scope>provided</scope>
</dependency>

<!-- test -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${jodatime.version}</version>
<scope>test</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>javassist</artifactId>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
Expand All @@ -108,28 +108,30 @@
<groupId>com.querydsl</groupId>
<artifactId>querydsl-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-money</artifactId>
<version>1.0.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<repositories></repositories>

<build>
<plugins>
<!--
<!--
<plugin>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-maven-plugin</artifactId>
Expand Down Expand Up @@ -159,8 +161,8 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Expand All @@ -185,17 +187,17 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>apt-jars</id>
<id>apt-jars</id>
<goals>
<goal>single</goal>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<configuration>
<descriptors>
<descriptor>src/main/general.xml</descriptor>
<descriptor>src/main/hibernate.xml</descriptor>
Expand All @@ -208,20 +210,20 @@
</descriptors>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.mysema.maven</groupId>
<artifactId>apt-maven-plugin</artifactId>
<executions>
<executions>
<execution>
<phase>generate-test-sources</phase>
<goals>
<goal>test-process</goal>
<goal>add-test-sources</goal>
</goals>
<phase>generate-test-sources</phase>
<configuration>
<outputDirectory>target/generated-test-sources/java</outputDirectory>
<logOnlyOnError>true</logOnlyOnError>
Expand All @@ -230,12 +232,12 @@
<processor>com.querydsl.apt.hibernate.HibernateAnnotationProcessor</processor>
<processor>com.querydsl.apt.jdo.JDOAnnotationProcessor</processor>
<processor>com.querydsl.apt.roo.RooAnnotationProcessor</processor>
</processors>
</processors>
</configuration>
</execution>
</execution>
</executions>
</plugin>

<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -259,6 +261,4 @@
</plugins>
</build>

<repositories />

</project>
150 changes: 61 additions & 89 deletions querydsl-apt/src/main/java/com/querydsl/apt/APTOptions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,97 +17,69 @@
* APT options supported by Querydsl
*
* @author tiwe
*
*/
public final class APTOptions {

/**
* set whether default variables are created (default: true)
*/
public static final String QUERYDSL_CREATE_DEFAULT_VARIABLE = "querydsl.createDefaultVariable";

/**
* set the prefix for query types (default: Q)
*/
public static final String QUERYDSL_PREFIX = "querydsl.prefix";

/**
* set a suffix for query types (default: empty)
*/
public static final String QUERYDSL_SUFFIX = "querydsl.suffix";

/**
* set a suffix for query type packages (default: empty)
*/
public static final String QUERYDSL_PACKAGE_SUFFIX = "querydsl.packageSuffix";

/**
* enable accessors for direct key based map access (default: false)
*/
public static final String QUERYDSL_MAP_ACCESSORS = "querydsl.mapAccessors";

/**
* enable accessors for direct indexed list access (default: false)
*/
public static final String QUERYDSL_LIST_ACCESSORS = "querydsl.listAccessors";

/**
* enable reference field accessors (default: false)
*/
public static final String QUERYDSL_ENTITY_ACCESSORS = "querydsl.entityAccessors";

/**
* Set whether fields are used as metadata source (default: true)
*/
public static final String QUERYDSL_USE_FIELDS = "querydsl.useFields";

/**
* Set whether accessors are used as metadata source (default: true)
*/
public static final String QUERYDSL_USE_GETTERS = "querydsl.useGetters";

/**
* comma separated list of packages to be excluded from code generation (default: none)
*/
public static final String QUERYDSL_EXCLUDED_PACKAGES = "querydsl.excludedPackages";

/**
* comma separated list of class names to be excluded from code generation (default: none)
*/
public static final String QUERYDSL_EXCLUDED_CLASSES = "querydsl.excludedClasses";

/**
* comma separated list of packages to be included into code generation (default: all)
*/
public static final String QUERYDSL_INCLUDED_PACKAGES = "querydsl.includedPackages";

/**
* comma separated list of class names to be included into code generation (default: all)
*/
public static final String QUERYDSL_INCLUDED_CLASSES = "querydsl.includedClasses";

/**
* set whether unknown non-annotated classes should be treated as embeddable (default: false)
*/
public static final String QUERYDSL_UNKNOWN_AS_EMBEDDABLE = "querydsl.unknownAsEmbeddable";

/**
* set the variable name function class
*/
public static final String QUERYDSL_VARIABLE_NAME_FUNCTION_CLASS = "querydsl.variableNameFunctionClass";

/**
* set whether info level messages should be written to stdout (default: false)
*/
public static final String QUERYDSL_LOG_INFO = "querydsl.logInfo";

/**
* the class instance of the <em>Single-Element Annotation</em> (with {@code String} element) to be used on the generated classes.
* (default: depending on java version: javax.annotation.Generated or javax.annotation.processing.Generated)
* @see <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element Annotation</a>
*/
public static final String QUERYDSL_GENERATED_ANNOTATION_CLASS = "querydsl.generatedAnnotationClass";

private APTOptions() { }
/** set whether default variables are created (default: true) */
public static final String QUERYDSL_CREATE_DEFAULT_VARIABLE = "querydsl.createDefaultVariable";

/** set the prefix for query types (default: Q) */
public static final String QUERYDSL_PREFIX = "querydsl.prefix";

/** set a suffix for query types (default: empty) */
public static final String QUERYDSL_SUFFIX = "querydsl.suffix";

/** set a suffix for query type packages (default: empty) */
public static final String QUERYDSL_PACKAGE_SUFFIX = "querydsl.packageSuffix";

/** enable accessors for direct key based map access (default: false) */
public static final String QUERYDSL_MAP_ACCESSORS = "querydsl.mapAccessors";

/** enable accessors for direct indexed list access (default: false) */
public static final String QUERYDSL_LIST_ACCESSORS = "querydsl.listAccessors";

/** enable reference field accessors (default: false) */
public static final String QUERYDSL_ENTITY_ACCESSORS = "querydsl.entityAccessors";

/** Set whether fields are used as metadata source (default: true) */
public static final String QUERYDSL_USE_FIELDS = "querydsl.useFields";

/** Set whether accessors are used as metadata source (default: true) */
public static final String QUERYDSL_USE_GETTERS = "querydsl.useGetters";

/** comma separated list of packages to be excluded from code generation (default: none) */
public static final String QUERYDSL_EXCLUDED_PACKAGES = "querydsl.excludedPackages";

/** comma separated list of class names to be excluded from code generation (default: none) */
public static final String QUERYDSL_EXCLUDED_CLASSES = "querydsl.excludedClasses";

/** comma separated list of packages to be included into code generation (default: all) */
public static final String QUERYDSL_INCLUDED_PACKAGES = "querydsl.includedPackages";

/** comma separated list of class names to be included into code generation (default: all) */
public static final String QUERYDSL_INCLUDED_CLASSES = "querydsl.includedClasses";

/** set whether unknown non-annotated classes should be treated as embeddable (default: false) */
public static final String QUERYDSL_UNKNOWN_AS_EMBEDDABLE = "querydsl.unknownAsEmbeddable";

/** set the variable name function class */
public static final String QUERYDSL_VARIABLE_NAME_FUNCTION_CLASS =
"querydsl.variableNameFunctionClass";

/** set whether info level messages should be written to stdout (default: false) */
public static final String QUERYDSL_LOG_INFO = "querydsl.logInfo";

/**
* the class instance of the <em>Single-Element Annotation</em> (with {@code String} element) to
* be used on the generated classes. (default: depending on java version:
* javax.annotation.Generated or javax.annotation.processing.Generated)
*
* @see <a
* href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.7.3">Single-Element
* Annotation</a>
*/
public static final String QUERYDSL_GENERATED_ANNOTATION_CLASS =
"querydsl.generatedAnnotationClass";

private APTOptions() {}
}
Loading

0 comments on commit 9f70294

Please sign in to comment.