You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by "noelma (via GitHub)" <gi...@apache.org> on 2023/02/09 22:34:37 UTC
[GitHub] [netbeans] noelma commented on a diff in pull request #5444: Cleanup j2ee.persistence module
noelma commented on code in PR #5444:
URL: https://github.com/apache/netbeans/pull/5444#discussion_r1102071706
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/JPAEditorUtil.java:
##########
@@ -290,7 +288,7 @@ public static DatabaseConnection findDatabaseConnection(PersistenceUnit pu, Proj
return null;
}
List<DatabaseConnection> dbconns = findDatabaseConnections(datasource);
- if (dbconns.size() > 0) {
+ if (!dbconns.isEmpty()) {
return dbconns.get(0);
}
return null;
Review Comment:
```suggestion
return dbconns.isEmpty()
? null
: dbconns.get(0);
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBCompletionContextResolver.java:
##########
@@ -238,7 +246,7 @@ private DatabaseConnection findDatabaseConnection(JPACodeCompletionProvider.Cont
return null;
}
List<DatabaseConnection> dbconns = findDatabaseConnections(datasource);
- if (dbconns.size() > 0) {
+ if (!dbconns.isEmpty()) {
return dbconns.get(0);
}
return null;
Review Comment:
```suggestion
return dbconns.isEmpty()
? null
: dbconns.get(0);
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/PersistenceClientEntitySelectionVisual.java:
##########
@@ -600,7 +584,9 @@ public Component getListCellRendererComponent(JList list, Object value, int inde
setBackground(list.getBackground());
setForeground(list.getForeground());
}
- if(text.length() == 0)text = " ";
+ if(text.length() == 0) {
+ text = " ";
Review Comment:
```suggestion
text = ' ';
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/jpacontroller/JpaControllerGenerator.java:
##########
@@ -226,488 +219,501 @@ private static FileObject generateJpaController(
return controllerFileObject;//don't need npe later
}
}
- controllerJavaSource.runModificationTask(new Task<WorkingCopy>() {
- @Override
- public void run(WorkingCopy workingCopy) throws IOException {
- workingCopy.toPhase(JavaSource.Phase.RESOLVED);
-
- ExecutableElement idGetterElement = idGetter.resolve(workingCopy);
- idGetterName[0] = idGetterElement.getSimpleName().toString();
- TypeMirror idType = idGetterElement.getReturnType();
- TypeElement idClass = null;
- if (TypeKind.DECLARED == idType.getKind()) {
- DeclaredType declaredType = (DeclaredType) idType;
- idClass = (TypeElement) declaredType.asElement();
- embeddable[0] = idClass != null && JpaControllerUtil.isEmbeddableClass(idClass);
- idPropertyType[0] = idClass.getQualifiedName().toString();
- if(!embeddable[0] && JpaControllerUtil.haveId(idClass)){//NOI18N
- //handle derived id, case entity/relationship without composite keys
- derived[0] = JpaControllerUtil.isRelationship(idGetterElement ,JpaControllerUtil.isFieldAccess(idClass)) != JpaControllerUtil.REL_NONE;
- if(derived[0]){
- ExecutableElement derivedIdGetterElement = findPrimaryKeyGetter(workingCopy, idClass);
- derivedIdGetterName[0] = derivedIdGetterElement.getSimpleName().toString();
- TypeMirror derivedIdType = derivedIdGetterElement.getReturnType();
- TypeElement derivedIdClass;
- if (TypeKind.DECLARED == idType.getKind()) {
- DeclaredType derivedDeclaredType = (DeclaredType) derivedIdType;
- derivedIdClass = (TypeElement) derivedDeclaredType.asElement();
- derivedIdPropertyType[0] = derivedIdClass.getQualifiedName().toString();
- }
+ controllerJavaSource.runModificationTask( (WorkingCopy workingCopy) -> {
+ workingCopy.toPhase(JavaSource.Phase.RESOLVED);
+
+ ExecutableElement idGetterElement = idGetter.resolve(workingCopy);
+ idGetterName[0] = idGetterElement.getSimpleName().toString();
+ TypeMirror idType = idGetterElement.getReturnType();
+ TypeElement idClass = null;
+ if (null == idType.getKind()) {
+ //instead of throwing exceptions later, just use Object
+ idPropertyType[0] = "java.lang.Object";//NOI18N
+ } else {
+ switch (idType.getKind()) {
+ case DECLARED:
+ DeclaredType declaredType = (DeclaredType) idType;
+ idClass = (TypeElement) declaredType.asElement();
+ embeddable[0] = idClass != null && JpaControllerUtil.isEmbeddableClass(idClass);
+ idPropertyType[0] = idClass.getQualifiedName().toString();
+ if(!embeddable[0] && JpaControllerUtil.haveId(idClass)){//NOI18N
+ //handle derived id, case entity/relationship without composite keys
+ derived[0] = JpaControllerUtil.isRelationship(idGetterElement ,JpaControllerUtil.isFieldAccess(idClass)) != JpaControllerUtil.REL_NONE;
+ if(derived[0]){
+ ExecutableElement derivedIdGetterElement = findPrimaryKeyGetter(workingCopy, idClass);
+ derivedIdGetterName[0] = derivedIdGetterElement.getSimpleName().toString();
+ TypeMirror derivedIdType = derivedIdGetterElement.getReturnType();
+ TypeElement derivedIdClass;
+ if (TypeKind.DECLARED == idType.getKind()) {
+ DeclaredType derivedDeclaredType = (DeclaredType) derivedIdType;
+ derivedIdClass = (TypeElement) derivedDeclaredType.asElement();
+ derivedIdPropertyType[0] = derivedIdClass.getQualifiedName().toString();
+ }
+ }
}
- }
- } else if (TypeKind.BOOLEAN == idType.getKind()) {
- idPropertyType[0] = "boolean";//NOI18N
- } else if (TypeKind.BYTE == idType.getKind()) {
- idPropertyType[0] = "byte";//NOI18N
- } else if (TypeKind.CHAR == idType.getKind()) {
- idPropertyType[0] = "char";//NOI18N
- } else if (TypeKind.DOUBLE == idType.getKind()) {
- idPropertyType[0] = "double";//NOI18N
- } else if (TypeKind.FLOAT == idType.getKind()) {
- idPropertyType[0] = "float";//NOI18N
- } else if (TypeKind.INT == idType.getKind()) {
- idPropertyType[0] = "int";//NOI18N
- } else if (TypeKind.LONG == idType.getKind()) {
- idPropertyType[0] = "long";//NOI18N
- } else if (TypeKind.SHORT == idType.getKind()) {
- idPropertyType[0] = "short";//NOI18N
- } else {
- //instead of throwing exceptions later, just use Object
- idPropertyType[0] = "java.lang.Object";//NOI18N
+ break;
+ case BOOLEAN:
+ idPropertyType[0] = "boolean";//NOI18N
+ break;
+ case BYTE:
+ idPropertyType[0] = "byte";//NOI18N
+ break;
+ case CHAR:
+ idPropertyType[0] = "char";//NOI18N
+ break;
+ case DOUBLE:
+ idPropertyType[0] = "double";//NOI18N
+ break;
+ case FLOAT:
+ idPropertyType[0] = "float";//NOI18N
+ break;
+ case INT:
+ idPropertyType[0] = "int";//NOI18N
+ break;
+ case LONG:
+ idPropertyType[0] = "long";//NOI18N
+ break;
+ case SHORT:
+ idPropertyType[0] = "short";//NOI18N
+ break;
+ default:
+ //instead of throwing exceptions later, just use Object
+ idPropertyType[0] = "java.lang.Object";//NOI18N
+ break;
}
+ }
+ String simpleIdPropertyType = JpaControllerUtil.simpleClassName(idPropertyType[0]);
+
+ TypeElement controllerTypeElement = SourceUtils.getPublicTopLevelElement(workingCopy);
+ ClassTree classTree = workingCopy.getTrees().getTree(controllerTypeElement);
+ ClassTree modifiedClassTree = classTree;
+
+ int privateModifier = java.lang.reflect.Modifier.PRIVATE;
+ int publicModifier = java.lang.reflect.Modifier.PUBLIC;
+
+ CompilationUnitTree modifiedImportCut = null;
+
+ List<String> parameterTypes = new ArrayList<>();
+ List<String> parameterNames = new ArrayList<>();
+ String body = ""; //NOI18N
+ boolean isUserTransaction = workingCopy.getClasspathInfo().getClassPath(ClasspathInfo.PathKind.COMPILE).findResource("javax/transaction/UserTransaction.class")!=null; //NOI18N
+ if (isUserTransaction && isInjection) {
+ modifiedClassTree = JpaControllerUtil.TreeMakerUtils.addVariable(modifiedClassTree, workingCopy, "utx", "javax.transaction.UserTransaction", privateModifier, null, null); //NOI18N
+ parameterTypes.add("javax.transaction.UserTransaction"); //NOI18N
+ parameterNames.add("utx"); //NOI18N
+ body = "this.utx = utx;\n"; //NOI18N
- String simpleIdPropertyType = JpaControllerUtil.simpleClassName(idPropertyType[0]);
-
- TypeElement controllerTypeElement = SourceUtils.getPublicTopLevelElement(workingCopy);
- ClassTree classTree = workingCopy.getTrees().getTree(controllerTypeElement);
- ClassTree modifiedClassTree = classTree;
-
- int privateModifier = java.lang.reflect.Modifier.PRIVATE;
- int publicModifier = java.lang.reflect.Modifier.PUBLIC;
-
- CompilationUnitTree modifiedImportCut = null;
-
- List<String> parameterTypes = new ArrayList<String>();
- List<String> parameterNames = new ArrayList<String>();
- String body = ""; //NOI18N
- boolean isUserTransaction = workingCopy.getClasspathInfo().getClassPath(ClasspathInfo.PathKind.COMPILE).findResource("javax/transaction/UserTransaction.class")!=null; //NOI18N
- if (isUserTransaction && isInjection) {
- modifiedClassTree = JpaControllerUtil.TreeMakerUtils.addVariable(modifiedClassTree, workingCopy, "utx", "javax.transaction.UserTransaction", privateModifier, null, null); //NOI18N
- parameterTypes.add("javax.transaction.UserTransaction"); //NOI18N
- parameterNames.add("utx"); //NOI18N
- body = "this.utx = utx;\n"; //NOI18N
-
- }
- modifiedClassTree = JpaControllerUtil.TreeMakerUtils.addVariable(modifiedClassTree, workingCopy, "emf", "javax.persistence.EntityManagerFactory", privateModifier, null, null); //NOI18N
- parameterTypes.add("javax.persistence.EntityManagerFactory"); //NOI18N
- parameterNames.add("emf"); //NOI18N
- body += "this.emf = emf;"; //NOI18N
- MethodInfo mi = new MethodInfo("<init>", publicModifier, "void", null, parameterTypes.toArray(new String[parameterTypes.size()]), //NOI18N
- parameterNames.toArray(new String[parameterNames.size()]), body, null, null);
- modifiedClassTree = JpaControllerUtil.TreeMakerUtils.modifyDefaultConstructor(classTree, modifiedClassTree, workingCopy, mi);
-
- MethodInfo methodInfo = new MethodInfo("getEntityManager", publicModifier, "javax.persistence.EntityManager", null, null, null, "return emf.createEntityManager();", null, null);
- modifiedClassTree = JpaControllerUtil.TreeMakerUtils.addMethod(modifiedClassTree, workingCopy, methodInfo);
-
- String bodyText;
- StringBuilder updateRelatedInCreate = new StringBuilder();
- StringBuilder updateRelatedInEditPre = new StringBuilder();
- StringBuilder attachRelatedInEdit = new StringBuilder();
- StringBuilder updateRelatedInEditPost = new StringBuilder();
- StringBuilder updateRelatedInDestroy = new StringBuilder();
- StringBuilder initRelatedInCreate = new StringBuilder();
- StringBuilder illegalOrphansInCreate = new StringBuilder();
- StringBuilder illegalOrphansInEdit = new StringBuilder();
- StringBuilder illegalOrphansInDestroy = new StringBuilder();
- StringBuilder initCollectionsInCreate = new StringBuilder(); //useful in case user removes listbox from New.jsp
-
- List<ElementHandle<ExecutableElement>> allRelMethods = new ArrayList<ElementHandle<ExecutableElement>>(toOneRelMethods);
- allRelMethods.addAll(toManyRelMethods);
-
- String[] importFqs = {"javax.persistence.Query",
- "javax.persistence.EntityNotFoundException"
- };
+ }
+ modifiedClassTree = JpaControllerUtil.TreeMakerUtils.addVariable(modifiedClassTree, workingCopy, "emf", "javax.persistence.EntityManagerFactory", privateModifier, null, null); //NOI18N
+ parameterTypes.add("javax.persistence.EntityManagerFactory"); //NOI18N
+ parameterNames.add("emf"); //NOI18N
+ body += "this.emf = emf;"; //NOI18N
+ MethodInfo mi = new MethodInfo("<init>", publicModifier, "void", null, parameterTypes.toArray(new String[0]), //NOI18N
+ parameterNames.toArray(new String[0]), body, null, null);
+ modifiedClassTree = JpaControllerUtil.TreeMakerUtils.modifyDefaultConstructor(classTree, modifiedClassTree, workingCopy, mi);
+
+ MethodInfo methodInfo = new MethodInfo("getEntityManager", publicModifier, "javax.persistence.EntityManager", null, null, null, "return emf.createEntityManager();", null, null);
+ modifiedClassTree = JpaControllerUtil.TreeMakerUtils.addMethod(modifiedClassTree, workingCopy, methodInfo);
+
+ String bodyText;
+ StringBuilder updateRelatedInCreate = new StringBuilder();
+ StringBuilder updateRelatedInEditPre = new StringBuilder();
+ StringBuilder attachRelatedInEdit = new StringBuilder();
+ StringBuilder updateRelatedInEditPost = new StringBuilder();
+ StringBuilder updateRelatedInDestroy = new StringBuilder();
+ StringBuilder initRelatedInCreate = new StringBuilder();
+ StringBuilder illegalOrphansInCreate = new StringBuilder();
+ StringBuilder illegalOrphansInEdit = new StringBuilder();
+ StringBuilder illegalOrphansInDestroy = new StringBuilder();
+ StringBuilder initCollectionsInCreate = new StringBuilder(); //useful in case user removes listbox from New.jsp
+
+ List<ElementHandle<ExecutableElement>> allRelMethods = new ArrayList<>(toOneRelMethods);
+ allRelMethods.addAll(toManyRelMethods);
+
+ String[] importFqs = {"javax.persistence.Query",
+ "javax.persistence.EntityNotFoundException"
+ };
+
+ for (String importFq : importFqs) {
+ modifiedImportCut = JpaControllerUtil.TreeMakerUtils.createImport(workingCopy, modifiedImportCut, importFq);
+ }
+ if(version!=null && !Persistence.VERSION_1_0.equals(version)){//add criteria classes if appropriate
Review Comment:
```suggestion
if(version != null && !Persistence.VERSION_1_0.equals(version)){//add criteria classes if appropriate
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/DbSchemaEntityMember.java:
##########
@@ -112,40 +116,50 @@ public void setPrimaryKey(boolean isPk, boolean isPkField) {
*/
private String getRespectiveNonPrimitiveType(){
String type = getMemberType();
- if ("int".equals(type)){//NOI18N
- return Integer.class.getName();
- } else if ("long".equals(type)){//NOI18N
- return Long.class.getName();
- } else if ("short".equals(type)){//NOI18N
- return Short.class.getName();
- } else if ("byte".equals(type)){//NOI18N
- return Byte.class.getName();
- } else if ("double".equals(type)){//NOI18N
- return Double.class.getName();
- } else if ("float".equals(type)){//NOI18N
- return Float.class.getName();
- } else if ("char".equals(type)){//NOI18N
- return Character.class.getName();
+ if (null == type){
+ return sqlType.getFirstNonPrimitiveType();
+ } else {
+ switch (type) {
+ case "int": //NOI18N
+ return Integer.class.getName();
+ case "long": //NOI18N
+ return Long.class.getName();
+ case "short": //NOI18N
+ return Short.class.getName();
+ case "byte": //NOI18N
+ return Byte.class.getName();
+ case "double": //NOI18N
+ return Double.class.getName();
+ case "float": //NOI18N
+ return Float.class.getName();
+ case "char": //NOI18N
+ return Character.class.getName();
+ default:
+ return sqlType.getFirstNonPrimitiveType();
+ }
}
Review Comment:
```suggestion
switch (type) {
case "int": //NOI18N
return Integer.class.getName();
case "long": //NOI18N
return Long.class.getName();
case "short": //NOI18N
return Short.class.getName();
case "byte": //NOI18N
return Byte.class.getName();
case "double": //NOI18N
return Double.class.getName();
case "float": //NOI18N
return Float.class.getName();
case "char": //NOI18N
return Character.class.getName();
default:
return sqlType.getFirstNonPrimitiveType();
}
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/ProviderUtil.java:
##########
@@ -595,22 +596,31 @@ public static Provider getProvider(PersistenceUnit persistenceUnit, Provider[] p
private static Set<Provider> filterProvidersByProperties(Set<Provider> providers, Property[] properties){
Set<Provider> ret = null;
if(providers == null){}
- else if(providers.size()<= 1 || properties==null || properties.length==0) ret = new HashSet(providers);
- else {
+ else if(providers.size()<= 1 || properties==null || properties.length==0) {
Review Comment:
```suggestion
else if(providers.size() <= 1 || properties == null || properties.length == 0) {
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/ProviderUtil.java:
##########
@@ -595,22 +596,31 @@ public static Provider getProvider(PersistenceUnit persistenceUnit, Provider[] p
private static Set<Provider> filterProvidersByProperties(Set<Provider> providers, Property[] properties){
Set<Provider> ret = null;
if(providers == null){}
- else if(providers.size()<= 1 || properties==null || properties.length==0) ret = new HashSet(providers);
- else {
+ else if(providers.size()<= 1 || properties==null || properties.length==0) {
ret = new HashSet(providers);
- HashMap <Integer, ArrayList<Provider>> rates = new HashMap<Integer, ArrayList<Provider>>();
+ } else {
+ ret = new HashSet(providers);
+ HashMap <Integer, ArrayList<Provider>> rates = new HashMap<>();
int lowrate = Integer.MAX_VALUE;
for(Provider each : providers){
int rate = 0;
for(Property prop: properties){
- if(each.getPropertyNames().contains(prop.getName()))rate++;
+ if(each.getPropertyNames().contains(prop.getName())) {
+ rate++;
+ }
+ }
+ if(rates.get(rate) == null) {
+ rates.put(rate, new ArrayList<Provider>());
}
- if(rates.get(rate) == null)rates.put(rate, new ArrayList<Provider>());
rates.get(rate).add(each);
- if(rate<lowrate)lowrate=rate;
+ if(rate<lowrate) {
Review Comment:
```suggestion
if(rate < lowrate) {
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/DBSchemaManager.java:
##########
@@ -151,32 +150,39 @@ public void run(final ProgressSupport.Context actionContext) {
}
schemaElement = new SchemaElement(schemaElementImpl);
- schemaElementImpl.addPropertyChangeListener(new PropertyChangeListener() {
- @Override
- public void propertyChange(PropertyChangeEvent event) {
- String propertyName = event.getPropertyName();
- String message = null;
-
- if ("totalCount".equals(propertyName)) { // NOI18N
- int workunits = ((Integer)event.getNewValue()).intValue();
- actionContext.switchToDeterminate(workunits);
- } else if ("progress".equals(propertyName)) { // NOI18N
- int workunit = ((Integer)event.getNewValue()).intValue();
- actionContext.progress(workunit);
- } else if ("tableName".equals(propertyName)) { // NOI18N
- message = NbBundle.getMessage(DBSchemaManager.class, "LBL_RetrievingTable", event.getNewValue());
- } else if ("viewName".equals(propertyName)) { // NOI18N
- message = NbBundle.getMessage(DBSchemaManager.class, "LBL_RetrievingView", event.getNewValue());
- } else if ("FKt".equals(propertyName)) { // NOI18N
- message = NbBundle.getMessage(DBSchemaManager.class, "LBL_RetrievingTableKeys", event.getNewValue());
- } else if ("FKv".equals(propertyName)) { // NOI18N
- message = NbBundle.getMessage(DBSchemaManager.class, "LBL_RetrievingViewKeys", event.getNewValue());
- }
-
- if (message != null) {
- actionContext.progress(message);
+ schemaElementImpl.addPropertyChangeListener( (PropertyChangeEvent event) -> {
+ String propertyName = event.getPropertyName();
+ String message = null;
+
+ if (null != propertyName) {
Review Comment:
```suggestion
if (propertyName != null) {
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/support/JPAAttribute.java:
##########
@@ -166,32 +167,43 @@ private void buildType(){
}
typeElement = (TypeElement) declaredType.asElement();
typeName = typeElement.getQualifiedName().toString();
- } else if (TypeKind.BOOLEAN == tm.getKind()) {
+ break;
+ case BOOLEAN:
typeName = ("boolean");//NOI18N
Review Comment:
```suggestion
typeName = "boolean";//NOI18N
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/Constructor.java:
##########
@@ -91,7 +91,7 @@ private TypeDeclaration typeToTypeDeclaration(TypeMirror tMirror){
if(aType.getKind() == TypeKind.DECLARED){
DeclaredType dType = (DeclaredType) aType;
List<? extends TypeMirror> parameters = dType.getTypeArguments();
- if( parameters!=null && parameters.size()>0){
+ if( parameters!=null && !parameters.isEmpty()){
Review Comment:
```suggestion
if( parameters != null && !parameters.isEmpty()){
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBMetaDataProvider.java:
##########
@@ -122,7 +118,9 @@ public synchronized Catalog getCatalog(String name) throws SQLException {
getCatalogs();
}
Catalog ret = (Catalog)catalogs.get(name);
- if(ret == null && "".equals(name))ret = (Catalog)catalogs.get(null);
+ if(ret == null && "".equals(name)) {
+ ret = (Catalog)catalogs.get(null);
+ }
return ret;
Review Comment:
```suggestion
return ret == null && "".equals(name))
?(Catalog)catalogs.get(null);
: ret;
```
##########
java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/EntityClassesPanel.java:
##########
@@ -373,9 +360,14 @@ private void updateSetAllButtons(){
{
for (Table table : selectedTables.getTables()) {
if(!selectedTables.getUpdateType(table).equals(UpdateType.NEW)){
- if(selectedTables.getUpdateType(table).equals(UpdateType.UPDATE))recreate=true;
- else update=true;
- if(update && recreate)break;
+ if(selectedTables.getUpdateType(table).equals(UpdateType.UPDATE)) {
+ recreate=true;
+ } else {
+ update=true;
Review Comment:
```suggestion
recreate = true;
} else {
update = true;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists