Skip to content

Gwtp 2.x jakarta namespace #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ManfredTremmel wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Gwtp 2.x jakarta namespace #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fb7bee
gin update, switched to jakarta namespace
ManfredTremmel Dec 10, 2024
6d0d9cd
dependencies updated
ManfredTremmel Jan 24, 2025
e7d4dd0
fixed javadoc errors
ManfredTremmel Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ META-INF
.checkstyle
chromedriver.log
.errai/
*.versionsBackup
*.versionsBackup
.factorypath
154 changes: 154 additions & 0 deletions codequality/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://users.tpg.com.au/ojburn/dtds/configuration_1_3.dtd">

<module name="Checker">
<property name="severity" value="error"/>
<property name="localeCountry" value="CA"/>
<property name="localeLanguage" value="en"/>

<module name="LineLength">
<property name="fileExtensions" value="java"/>
<property name="max" value="120"/>
<property name="ignorePattern" value="^(import( static)?|package) [^ ]+$"/>
</module>

<module name="TreeWalker">
<module name="DeclarationOrder"/>
<module name="EqualsHashCode"/>
<module name="ExplicitInitialization"/>
<module name="GenericWhitespace"/>
<module name="MethodParamPad"/>
<module name="MissingOverride"/>
<module name="ModifiedControlVariable"/>
<module name="ParameterAssignment"/>
<module name="ParenPad"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>
<module name="UnnecessaryParentheses"/>
<module name="Indentation">
<property name="basicOffset" value="4" />
<property name="throwsIndent" value="8"/>
<property name="arrayInitIndent" value="8"/>
<property name="lineWrappingIndentation" value="8"/>
</module>
<module name="InterfaceIsType"/>
<module name="RedundantImport"/>
<module name="UnusedImports">
<property name="processJavadoc" value="true"/>
</module>
<module name="IllegalImport"/>
<module name="AvoidStarImport"/>
<module name="ImportOrder">
<property name="option" value="bottom"/>
<property name="ordered" value="true"/>
<property name="separated" value="true"/>
<property name="groups" value="java,javax,org,com"/>
</module>
<module name="JavadocStyle">
<property name="checkHtml" value="false"/>
<property name="tokens" value="CLASS_DEF,CTOR_DEF,INTERFACE_DEF,METHOD_DEF,VARIABLE_DEF"/>
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Well formed java docs"/>
</module>
<module name="ParameterName"/>
<module name="LocalFinalVariableName">
<property name="format" value="^(\$|\$?[a-z][a-zA-Z0-9]*)$"/>
</module>
<module name="LocalVariableName">
<property name="tokens" value="VARIABLE_DEF"/>
<property name="format" value="^(\$|\$?[a-z][a-zA-Z0-9]*)$"/>
</module>
<module name="LeftCurly"/>
<module name="RightCurly"/>
<module name="NeedBraces">
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="make sure if has braces"/>
</module>
<module name="CovariantEquals"/>
<module name="IllegalInstantiation">
<property name="classes" value="java.lang.Boolean"/>
</module>
<module name="UpperEll">
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="checking for 4l rather than 4L"/>
</module>
<module name="DefaultComesLast"/>
<module name="MultipleStringLiterals">
<property name="ignoreStringsRegexp" value=".{0,3}"/>
</module>
<module name="IllegalInstantiation">
<property name="classes" value="Boolean"/>
</module>
<module name="Regexp">
<property name="format" value="[\r]?[\n][ \t]*[\r]?[\n][ \t]*[\r]?[\n][ \t]*"/>
<property name="message" value="more than one blank line"/>
<property name="illegalPattern" value="true"/>
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="more than one blank line"/>
</module>
<module name="Regexp">
<property name="format" value="[\r]?[\n][ \t]*[\r]?[\n][ \t]+[}][ ]*[\n]"/>
<property name="message" value="newline before }"/>
<property name="illegalPattern" value="true"/>
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="newline before }"/>
</module>
<module name="Regexp">
<property name="format" value="[^*][ \t]+[\r]?[\n]"/>
<property name="message" value="trailing whitespace"/>
<property name="illegalPattern" value="true"/>
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="trailing whitespace"/>
</module>
<module name="RedundantModifier"/>
<module name="ModifierOrder"/>
<module name="EmptyStatement"/>
<module name="MethodName"/>
<module name="MemberName">
<property name="format" value="[a-z]|[a-z][a-z_0-9][A-Za-z0-9_]*|[a-z](?&lt;!f)[A-Z0-9]*"/>
</module>
<module name="NoWhitespaceBefore">
<property name="allowLineBreaks" value="true"/>
<property name="tokens" value="DOT"/>
</module>
<module name="NoWhitespaceAfter">
<property name="allowLineBreaks" value="false"/>
<property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
</module>
<module name="WhitespaceAround">
<property name="tokens"
value="COLON,NOT_EQUAL,QUESTION,DIV,DIV_ASSIGN,BXOR,BXOR_ASSIGN,MINUS,LCURLY,STAR,STAR_ASSIGN,TYPE_EXTENSION_AND,BAND,LAND,BAND_ASSIGN,MOD,MOD_ASSIGN,PLUS,PLUS_ASSIGN,LT,SL,SL_ASSIGN,LE,ASSIGN,MINUS_ASSIGN,EQUAL,GT,GE,SR,SR_ASSIGN,BSR,BSR_ASSIGN,BOR,BOR_ASSIGN,LOR,LITERAL_ASSERT,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,SLIST,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Must have spaces"/>
</module>
<module name="WhitespaceAfter">
<property name="tokens" value="TYPECAST"/>
</module>
<module name="TypecastParenPad">
<property name="tokens" value="RPAREN,TYPECAST"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE_OFF"/>
<property name="onCommentFormat" value="CHECKSTYLE_ON"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE_NAMING_OFF"/>
<property name="onCommentFormat" value="CHECKSTYLE_NAMING_ON"/>
<property name="checkFormat" value=".*Name.*"/>
<property name="messageFormat" value=".*name.*"/>
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Avoid name checking"/>
</module>
</module>

<module name="Translation"/>
<module name="NewlineAtEndOfFile">
<property name="lineSeparator" value="lf"/>
</module>
<module name="FileTabCharacter">
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="no tabs"/>
</module>
<module name="RegexpSingleline">
<property name="format" value=" [/][/][A-z]"/>
<property name="message" value="// comments must be followed by a space and be on their own line"/>
<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="bad // comment"/>
</module>
<module name="RegexpHeader">
<property name="fileExtensions" value="java"/>
<property name="headerFile" value="codequality/opensource.java.header"/>
</module>
</module>
15 changes: 15 additions & 0 deletions codequality/opensource.java.header
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/\*\*?
\* Copyright \d{4} ArcBees Inc\.
\*
\* Licensed under the Apache License, Version 2\.0 \(the "License"\); you may not
\* use this file except in compliance with the License\. You may obtain a copy of
\* the License at
\*
\* http://www\.apache\.org/licenses/LICENSE-2\.0
\*
\* Unless required by applicable law or agreed to in writing, software
\* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
\* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\. See the
\* License for the specific language governing permissions and limitations under
\* the License\.
\*/
15 changes: 15 additions & 0 deletions codequality/suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://users.tpg.com.au/ojburn/dtds/suppressions_1_1.dtd">

<suppressions>
<!-- Suppress files under target -->
<suppress checks=".*" files=".*[/\\]target[/\\].*"/>

<!-- Suppress method naming under test -->
<suppress checks="MethodName" files=".*[/\\]test[/\\].*"/>

<!-- Suppress files under com/google -->
<suppress checks=".*" files="com[/\\]google[/\\]"/>
</suppressions>
22 changes: 11 additions & 11 deletions gwtp-core/gwtp-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<properties>
<maven-site-plugin.skip>true</maven-site-plugin.skip>

<maven-assembly-plugin.version>2.5.3</maven-assembly-plugin.version>
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
</properties>

<!-- The compound jar consist of the following dependencies -->
Expand Down Expand Up @@ -240,7 +240,7 @@
<!-- This is needed in order for the classes from gwt-dev that
(are used in ProxyGenerator class) to be resolved while creating the javadoc -->
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-dev</artifactId>
<scope>provided</scope>
</dependency>
Expand Down Expand Up @@ -274,7 +274,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
<version>3.8.1</version>
<executions>
<execution>
<id>unpack-dependencies</id>
Expand All @@ -299,7 +299,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.6</version>
<version>3.1.0</version>
<executions>
<!-- Generate the javadoc -->
<execution>
Expand All @@ -317,12 +317,12 @@
All Rights Reserved.</i>]]>
</bottom>
<classpath refid="maven.compile.classpath" />
<link href="http://download.oracle.com/javase/6/docs/api/" />
<link href="http://google-web-toolkit.googlecode.com/svn/javadoc/2.0/" />
<link href="http://static.springsource.org/spring/docs/3.0.x/javadoc-api/" />
<link href="http://google-gin.googlecode.com/svn/trunk/javadoc/" />
<link href="http://google-guice.googlecode.com/svn/trunk/javadoc/" />
<link href="http://aopalliance.sourceforge.net/doc/" />
<link href="https://docs.oracle.com/en/java/javase/11/docs/api/" />
<link href="https://www.gwtproject.org/javadoc/latest/" />
<link href="https://docs.spring.io/spring-framework/docs/current/javadoc-api/" />
<link href="https://gwtplus.github.io/google-gin/latest/javadoc/" />
<link href="https://javadoc.io/doc/com.google.inject/guice/latest/index.html" />
<link href="https://aopalliance.sourceforge.net/doc/" />
<link href="https://github.com/nmorel/gwt-jackson/wiki/" />
</javadoc>
<jar destfile="${javadocArtifactFile}" basedir="${unpackedJavadocDir}" includes="**/**" />
Expand All @@ -339,7 +339,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
<version>3.6.0</version>
<executions>
<execution>
<id>attach-artifacts</id>
Expand Down
10 changes: 3 additions & 7 deletions gwtp-core/gwtp-clients-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,17 @@

<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-user</artifactId>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<groupId>org.gwtproject</groupId>
<artifactId>gwt-dev</artifactId>
</dependency>
<dependency>
<groupId>com.google.gwt.inject</groupId>
<groupId>de.knightsoft-net</groupId>
<artifactId>gin</artifactId>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>

<dependency>
<groupId>com.gwtplatform</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...p-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitBundleProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

package com.gwtplatform.common.client;

import javax.inject.Provider;

import com.google.gwt.inject.client.AsyncProvider;
import com.google.gwt.user.client.rpc.AsyncCallback;

import jakarta.inject.Provider;

/**
* Implements a {@link IndirectProvider} that uses code splitting for a specific type. The object will be provided from
* a {@link ProviderBundle}.
Expand Down
4 changes: 2 additions & 2 deletions ...ents-common/src/main/java/com/gwtplatform/common/client/CodeSplitNamedBundleProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

package com.gwtplatform.common.client;

import javax.inject.Provider;

import com.google.gwt.inject.client.AsyncProvider;
import com.google.gwt.user.client.rpc.AsyncCallback;

import jakarta.inject.Provider;

public class CodeSplitNamedBundleProvider<T, B extends NamedProviderBundle> implements IndirectProvider<T> {
private final AsyncProvider<B> bundleProvider;
private final String providerName;
Expand Down
4 changes: 2 additions & 2 deletions ...core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CommonGinModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

package com.gwtplatform.common.client;

import javax.inject.Singleton;

import com.google.gwt.inject.client.AbstractGinModule;
import com.gwtplatform.common.shared.UrlUtils;

import jakarta.inject.Singleton;

/**
* Common client bindings.
* You can safely install this module multiple times as the bindings will be performed only on the first install.
Expand Down
2 changes: 1 addition & 1 deletion .../gwtp-clients-common/src/main/java/com/gwtplatform/common/client/NamedProviderBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.util.List;
import java.util.Map.Entry;

import javax.inject.Provider;
import jakarta.inject.Provider;

public abstract class NamedProviderBundle extends ProviderBundle {
private final List<String> presenterIds;
Expand Down
8 changes: 4 additions & 4 deletions ...-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.gwtplatform.common.client;

import javax.inject.Provider;
import jakarta.inject.Provider;

/**
* This class can be used to contain a group of providers that should all sit
Expand All @@ -26,7 +26,7 @@
* the objects were behind their individual split points.
* GWTP automatically handles ProviderBundles when used with ApplicationController
* and Ginjector generation.
* <p/>
* <p>
* Here is an example use of a manual {@link ProviderBundle}:
* <pre>
* public class MyPresenterBundle extends ProviderBundle {
Expand All @@ -36,8 +36,8 @@
*
* &#064;Inject
* MyPresenterBundle(
* final Provider<Object1> object1Provider,
* final Provider<Object2> object2Provider) {
* final Provider&lt;Object1&gt; object1Provider,
* final Provider&lt;Object2&gt; object2Provider) {
* super( BUNDLE_SIZE );
* providers[ID_Object1] = object1Provider;
* providers[ID_Object2] = object2Provider;
Expand Down
4 changes: 2 additions & 2 deletions ...ore/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/StandardProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.gwtplatform.common.client;

import javax.inject.Provider;

import com.google.gwt.user.client.rpc.AsyncCallback;

import jakarta.inject.Provider;

/**
* An {@link IndirectProvider} that immediately gets the object and invokes the callback, without performing code
* splitting. This is essentially the same as a standard {@link Provider}, but shares the interface of other {@link
Expand Down
3 changes: 2 additions & 1 deletion ...ava/com/gwtplatform/common/processors/bundles/NamedProviderBundleCollectionProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import javax.annotation.processing.Processor;
import javax.annotation.processing.RoundEnvironment;
import javax.inject.Singleton;
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;

Expand All @@ -34,6 +33,8 @@
import com.gwtplatform.processors.tools.bindings.BindingsProcessors;
import com.gwtplatform.processors.tools.domain.Type;

import jakarta.inject.Singleton;

import static com.google.auto.common.MoreElements.asType;
import static com.gwtplatform.common.processors.module.GwtpAppModuleProcessor.MAIN_MODULE_TYPE;
import static com.gwtplatform.processors.tools.bindings.BindingContext.newBinding;
Expand Down
Loading