Commit 94aa1cf750d06ccae0387ce2d08e3fa620e38ea0

ROO-2446: Post 1.1.4.RELEASE code refactor and clean up - replace use of Colelction.size() == 0 with isEmpty()
addon-cloud-foundry/src/main/java/org/springframework/roo/addon/cloud/foundry/CloudFoundryOperationsImpl.java
(6 / 6)
  
104104 public void execute() throws Exception {
105105 List<ServiceConfiguration> globalServices = client.getServiceConfigurations();
106106 List<CloudService> localServices = client.getServices();
107 if (globalServices.size() == 0) {
107 if (globalServices.isEmpty()) {
108108 logger.info("There are currently no services available.");
109109 } else {
110110 ShellTableRenderer table = new ShellTableRenderer("System Services", "Service", "Version", "Description");
……
114114 logger.info(table.getOutput());
115115 }
116116
117 if (localServices.size() == 0) {
117 if (localServices.isEmpty()) {
118118 logger.info("There are currently no provisioned services.");
119119 } else {
120120 ShellTableRenderer table = new ShellTableRenderer("Provisioned Services", "Name", "Service");
……
188188 @Override
189189 public void execute() throws Exception {
190190 List<CloudApplication> applications = client.getApplications();
191 if (applications.size() == 0) {
191 if (applications.isEmpty()) {
192192 logger.info("No applications available.");
193193 return;
194194 }
……
309309 Integer instances = getInteger(number);
310310 if (instances == null) {
311311 InstancesInfo instancesInfo = client.getApplicationInstances(appName);
312 if (instancesInfo.getInstances().size() == 0) {
312 if (instancesInfo.getInstances().isEmpty()) {
313313 logger.info("No running instances for '" + appName + "'");
314314 }
315315 } else {
……
342342 logger.severe(this.failureMessage);
343343 return;
344344 }
345 if (crashes.getCrashes().size() == 0) {
345 if (crashes.getCrashes().isEmpty()) {
346346 logger.info("The application '" + appName + "' has never crashed");
347347 return;
348348 }
……
406406 @Override
407407 public void execute() throws Exception {
408408 ApplicationStats stats = client.getApplicationStats(appName);
409 if (stats.getRecords().size() == 0) {
409 if (stats.getRecords().isEmpty()) {
410410 logger.info("There is currently no stats for the application '" + appName + "'");
411411 return;
412412 }
addon-cloud-foundry/src/main/java/org/springframework/roo/addon/cloud/foundry/ShellTableRenderer.java
(1 / 1)
  
2525 }
2626
2727 public void addColumn(String heading) {
28 int position = columnMap.size() == 0 ? 0 : columnMap.size();
28 int position = columnMap.isEmpty() ? 0 : columnMap.size();
2929 List<String> list = new ArrayList<String>();
3030 list.add(heading);
3131 list.add(getUnderline(heading.length()));
addon-cloud-foundry/src/main/java/org/springframework/roo/addon/cloud/foundry/converter/CloudDeployableFileConverter.java
(1 / 1)
  
7272 String rootPath = projectOperations.getPathResolver().getRoot(Path.ROOT);
7373 Set<FileDetails> fileDetails = fileManager.findMatchingAntPath(rootPath + "/**/*.war");
7474
75 if (fileDetails.size() == 0) {
75 if (fileDetails.isEmpty()) {
7676 logger.warning("No deployable files found in the project directory. Please use the '" + CREATE_OPTION + "' option to build the war.");
7777 completions.add(CREATE_OPTION);
7878 }
addon-entity/src/main/java/org/springframework/roo/addon/entity/EntityMetadata.java
(1 / 1)
  
321321 return null;
322322 }
323323
324 if (governorTypeDetails.getDeclaredConstructors().size() == 0) {
324 if (governorTypeDetails.getDeclaredConstructors().isEmpty()) {
325325 // Default constructor will apply, so quit
326326 return null;
327327 }
addon-gwt/src/main/java/org/springframework/roo/addon/gwt/GwtTypeServiceImpl.java
(1 / 1)
  
526526 }
527527
528528 private boolean isPublicAccessor(MethodMetadata method) {
529 return Modifier.isPublic(method.getModifier()) && !method.getReturnType().equals(JavaType.VOID_PRIMITIVE) && method.getParameterTypes().size() == 0 && (method.getMethodName().getSymbolName().startsWith("get"));
529 return Modifier.isPublic(method.getModifier()) && !method.getReturnType().equals(JavaType.VOID_PRIMITIVE) && method.getParameterTypes().isEmpty() && (method.getMethodName().getSymbolName().startsWith("get"));
530530 }
531531
532532 private boolean isDomainObject(JavaType returnType, PhysicalTypeMetadata ptmd) {
addon-roobot-client/src/main/java/org/springframework/roo/addon/roobot/client/AddOnRooBotOperationsImpl.java
(4 / 4)
  
265265 if (maxResults < 1) {
266266 maxResults = 10;
267267 }
268 if (bundleCache.size() == 0) {
268 if (bundleCache.isEmpty()) {
269269 // We should refresh regardless in this case
270270 refresh = true;
271271 }
……
311311
312312 public void listAddOns(boolean refresh, int linesPerResult, int maxResults, boolean trustedOnly, boolean compatibleOnly, boolean communityOnly, String requiresCommand) {
313313 synchronized (mutex) {
314 if (bundleCache.size() == 0) {
314 if (bundleCache.isEmpty()) {
315315 // We should refresh regardless in this case
316316 refresh = true;
317317 }
……
509509 ArrayList<String> split = new ArrayList<String>(Arrays.asList(latest.getDescription().split("\\s")));
510510 int lpr = linesPerResult;
511511 while (split.size() > 0 && --lpr >= 0) {
512 while (!(split.size() == 0) && ((split.get(0).length() + sb.length()) < (lpr == 0 ? 77 : 80))) {
512 while (!(split.isEmpty()) && ((split.get(0).length() + sb.length()) < (lpr == 0 ? 77 : 80))) {
513513 sb.append(split.get(0)).append(" ");
514514 split.remove(0);
515515 }
……
726726 }
727727 } else {
728728 while (split.size() > 0) {
729 while (!(split.size() == 0) && ((split.get(0).length() + sb.length()) < 79)) {
729 while (!(split.isEmpty()) && ((split.get(0).length() + sb.length()) < 79)) {
730730 sb.append(split.get(0)).append(" ");
731731 split.remove(0);
732732 }
addon-security/src/main/java/org/springframework/roo/addon/security/SecurityOperationsImpl.java
(1 / 1)
  
4343 public boolean isInstallSecurityAvailable() {
4444 // Do not permit installation unless they have a web project (as per ROO-342)
4545 // and only permit installation if they don't already have some version of Spring Security installed
46 return projectOperations.isProjectAvailable() && fileManager.exists(projectOperations.getPathResolver().getIdentifier(Path.SRC_MAIN_WEBAPP, "/WEB-INF/web.xml")) && projectOperations.getProjectMetadata().getDependenciesExcludingVersion(new Dependency("org.springframework.security", "spring-security-core", SECURITY_VERSION)).size() == 0;
46 return projectOperations.isProjectAvailable() && fileManager.exists(projectOperations.getPathResolver().getIdentifier(Path.SRC_MAIN_WEBAPP, "/WEB-INF/web.xml")) && projectOperations.getProjectMetadata().getDependenciesExcludingVersion(new Dependency("org.springframework.security", "spring-security-core", SECURITY_VERSION)).isEmpty();
4747 }
4848
4949 public void installSecurity() {
addon-solr/src/main/java/org/springframework/roo/addon/solr/SolrMetadataProvider.java
(1 / 1)
  
115115 }
116116
117117 private boolean isMethodOfInterest(MethodMetadata method) {
118 return method.getMethodName().getSymbolName().startsWith("get") && method.getParameterTypes().size() == 0 && Modifier.isPublic(method.getModifier());
118 return method.getMethodName().getSymbolName().startsWith("get") && method.getParameterTypes().isEmpty() && Modifier.isPublic(method.getModifier());
119119 }
120120
121121 public String getItdUniquenessFilenameSuffix() {
addon-web-mvc-controller/src/main/java/org/springframework/roo/addon/web/mvc/controller/details/JavaTypePersistenceMetadataDetails.java
(2 / 0)
  
1717 private FieldMetadata identifierField;
1818 private MethodMetadata identifierAccessorMethod;
1919 private MethodMetadata versionAccessorMethod;
20
2021 private MethodMetadata persistMethod;
2122 private MethodMetadata mergeMethod;
2223 private MethodMetadata removeMethod;
……
2525 private MethodMetadata findMethod;
2626 private MethodMetadata countMethod;
2727 private MethodMetadata findEntriesMethod;
28
2829 private List<String> finderNames;
2930 private boolean isRooIdentifier;
3031 private List<FieldMetadata> rooIdentifierFields;
addon-web-mvc-controller/src/main/java/org/springframework/roo/addon/web/mvc/controller/details/WebMetadataServiceImpl.java
(1 / 1)
  
163163 JavaTypePersistenceMetadataDetails javaTypePersistenceMetadataDetails = null;
164164 List<FieldMetadata> idFields = MemberFindingUtils.getFieldsWithTag(memberDetails, PersistenceCustomDataKeys.IDENTIFIER_FIELD);
165165 List<FieldMetadata> compositePkFields = new LinkedList<FieldMetadata>();
166 if (idFields.size() == 0) {
166 if (idFields.isEmpty()) {
167167 idFields = MemberFindingUtils.getFieldsWithTag(memberDetails, PersistenceCustomDataKeys.EMBEDDED_ID_FIELD);
168168 if (idFields.size() != 1) {
169169 return null;
addon-web-mvc-jsp/src/main/java/org/springframework/roo/addon/web/mvc/jsp/JspMetadataListener.java
(1 / 1)
  
115115 }
116116
117117 List<FieldMetadata> eligibleFields = webMetadataService.getScaffoldEligibleFieldMetadata(formBackingType, memberDetails, metadataIdentificationString);
118 if (eligibleFields.size() == 0) {
118 if (eligibleFields.isEmpty()) {
119119 return null;
120120 }
121121
addon-web-mvc-jsp/src/main/java/org/springframework/roo/addon/web/mvc/jsp/JspViewManager.java
(1 / 1)
  
382382 return null;
383383 }
384384 List<JavaType> parameters = field.getFieldType().getParameters();
385 if (parameters.size() == 0) {
385 if (parameters.isEmpty()) {
386386 throw new IllegalStateException("Unable to determine the parameter type for the " + field.getFieldName().getSymbolName() + " field in " + formbackingType.getSimpleTypeName());
387387 }
388388 return parameters.get(0);
addon-web-mvc-jsp/src/main/java/org/springframework/roo/addon/web/mvc/jsp/menu/MenuOperationsImpl.java
(1 / 1)
  
109109
110110 // Find any menu items under this category which have an id that starts with the menuItemIdPrefix
111111 List<Element> elements = XmlUtils.findElements("//category[@id='c_" + menuCategoryName.getSymbolName().toLowerCase() + "']//item[starts-with(@id, '" + FINDER_MENU_ITEM_PREFIX + "')]", document.getDocumentElement());
112 if (elements.size() == 0) {
112 if (elements.isEmpty()) {
113113 return;
114114 }
115115 for (Element element: elements) {
classpath-javaparser/src/main/java/org/springframework/roo/classpath/javaparser/details/JavaParserAnnotationMetadata.java
(1 / 1)
  
299299
300300 // Create the AnnotationExpr; it varies depending on how many member-value pairs we need to present
301301 AnnotationExpr annotationExpression = null;
302 if (memberValuePairs.size() == 0) {
302 if (memberValuePairs.isEmpty()) {
303303 annotationExpression = new MarkerAnnotationExpr(nameToUse);
304304 } else if (memberValuePairs.size() == 1 && (memberValuePairs.get(0).getName() == null || "value".equals(memberValuePairs.get(0).getName()))) {
305305 Expression toUse = JavaParserUtils.importExpressionIfRequired(compilationUnitServices.getEnclosingTypeName(), compilationUnitServices.getImports(), memberValuePairs.get(0).getValue());
classpath/src/main/java/org/springframework/roo/classpath/MetadataCommands.java
(2 / 2)
  
5050 sb.append("Identifier : ").append(metadataId).append(System.getProperty("line.separator"));
5151
5252 Set<String> upstream = metadataDependencyRegistry.getUpstream(metadataId);
53 if (upstream.size() == 0) {
53 if (upstream.isEmpty()) {
5454 sb.append("Upstream : ").append(System.getProperty("line.separator"));
5555 }
5656
……
6868 }
6969
7070 Set<String> downstream = metadataDependencyRegistry.getDownstream(metadataId);
71 if (downstream.size() == 0) {
71 if (downstream.isEmpty()) {
7272 sb.append("Downstream : ").append(System.getProperty("line.separator"));
7373 }
7474 for (String s : downstream) {
classpath/src/main/java/org/springframework/roo/classpath/details/AnnotationMetadataUtils.java
(1 / 1)
  
6161 sb.append(annotation.getAnnotationType().getFullyQualifiedTypeName());
6262 }
6363
64 if (annotation.getAttributeNames().size() == 0) {
64 if (annotation.getAttributeNames().isEmpty()) {
6565 return sb.toString();
6666 }
6767
classpath/src/main/java/org/springframework/roo/classpath/itd/ItdSourceFileComposer.java
(8 / 8)
  
138138
139139 private void appendTypeAnnotations() {
140140 List<? extends AnnotationMetadata> typeAnnotations = itdTypeDetails.getAnnotations();
141 if (typeAnnotations == null || typeAnnotations.size() == 0) {
141 if (typeAnnotations == null || typeAnnotations.isEmpty()) {
142142 return;
143143 }
144144
……
158158
159159 private void appendFieldAnnotations() {
160160 List<DeclaredFieldAnnotationDetails> fieldAnnotations = itdTypeDetails.getFieldAnnotations();
161 if (fieldAnnotations == null || fieldAnnotations.size() == 0) {
161 if (fieldAnnotations == null || fieldAnnotations.isEmpty()) {
162162 return;
163163 }
164164
……
183183
184184 private void appendMethodAnnotations() {
185185 List<DeclaredMethodAnnotationDetails> methodAnnotations = itdTypeDetails.getMethodAnnotations();
186 if (methodAnnotations == null || methodAnnotations.size() == 0) {
186 if (methodAnnotations == null || methodAnnotations.isEmpty()) {
187187 return;
188188 }
189189
……
216216
217217 private void appendExtendsTypes() {
218218 List<JavaType> extendsTypes = itdTypeDetails.getExtendsTypes();
219 if (extendsTypes == null || extendsTypes.size() == 0) {
219 if (extendsTypes == null || extendsTypes.isEmpty()) {
220220 return;
221221 }
222222
……
241241 private void appendImplementsTypes() {
242242 List<JavaType> implementsTypes = itdTypeDetails.getImplementsTypes();
243243
244 if (implementsTypes == null || implementsTypes.size() == 0) {
244 if (implementsTypes == null || implementsTypes.isEmpty()) {
245245 return;
246246 }
247247
……
265265
266266 private void appendConstructors() {
267267 List<? extends ConstructorMetadata> constructors = itdTypeDetails.getDeclaredConstructors();
268 if (constructors == null || constructors.size() == 0) {
268 if (constructors == null || constructors.isEmpty()) {
269269 return;
270270 }
271271 content = true;
……
321321
322322 private void appendMethods() {
323323 List<? extends MethodMetadata> methods = itdTypeDetails.getDeclaredMethods();
324 if (methods == null || methods.size() == 0) {
324 if (methods == null || methods.isEmpty()) {
325325 return;
326326 }
327327 content = true;
……
330330
331331 private void appendFields() {
332332 List<? extends FieldMetadata> fields = itdTypeDetails.getDeclaredFields();
333 if (fields == null || fields.size() == 0) {
333 if (fields == null || fields.isEmpty()) {
334334 return;
335335 }
336336 content = true;
felix/src/main/java/org/springframework/roo/felix/pgp/PgpCommands.java
(2 / 2)
  
4343 @CliCommand(value="pgp list trusted keys", help="Lists the keys you currently trust and have not been revoked at the time last downloaded from a public key server")
4444 public String listTrustedKeys() {
4545 List<PGPPublicKeyRing> keyRings = pgpService.getTrustedKeys();
46 if (keyRings.size() == 0) {
46 if (keyRings.isEmpty()) {
4747 StringBuilder sb = new StringBuilder();
4848 appendLine(sb, "No keys trusted; use 'pgp trust' to add a key or 'pgp automatic trust' for automatic key addition");
4949 return sb.toString();
5050 }
5151 StringBuilder sb = new StringBuilder();
5252 for (PGPPublicKeyRing keyRing : keyRings) {
53 formatKeyRing(sb, keyRing);
53 formatKeyRing(sb, keyRing);
5454 }
5555 return sb.toString();
5656 }
file-monitor-polling/src/main/java/org/springframework/roo/file/monitor/polling/PollingFileMonitorService.java
(5 / 5)
  
7272 public List<FileDetails> getMonitored() {
7373 synchronized (lock) {
7474 List<FileDetails> monitored = new ArrayList<FileDetails>();
75 if (requests.size() == 0) {
75 if (requests.isEmpty()) {
7676 return monitored;
7777 }
7878
……
123123
124124 public int scanNotified() {
125125 synchronized (lock) {
126 if (requests.size() == 0 || !isDirty()) {
126 if (requests.isEmpty() || !isDirty()) {
127127 // There are no changes we can notify, so immediately return
128128 return 0;
129129 }
……
221221
222222 public int scanAll() {
223223 synchronized (lock) {
224 if (requests.size() == 0) {
224 if (requests.isEmpty()) {
225225 return 0;
226226 }
227227
……
319319 * @param eventsToPublish to publish (not null, but can be empty)
320320 */
321321 private void publish(List<FileEvent> eventsToPublish) {
322 if (eventsToPublish.size() == 0) {
322 if (eventsToPublish.isEmpty()) {
323323 return;
324324 }
325 if (fileEventListeners.size() == 0 || eventsToPublish.size() == 0) {
325 if (fileEventListeners.isEmpty() || eventsToPublish.isEmpty()) {
326326 return;
327327 }
328328 for (FileEvent event : eventsToPublish) {
metadata/src/main/java/org/springframework/roo/metadata/DefaultMetadataService.java
(1 / 1)
  
180180 // We use another try..finally block as we want to ensure exceptions don't prevent our metadataLogger.stopEvent()
181181 try {
182182 // Have we processed all requests? If so, handle any retries we recorded
183 if (activeRequests.size() == 0) {
183 if (activeRequests.isEmpty()) {
184184 List<String> thisRetry = new ArrayList<String>();
185185 thisRetry.addAll(keysToRetry);
186186 keysToRetry.clear();
model/src/main/java/org/springframework/roo/model/JavaType.java
(1 / 1)
  
170170
171171 private String getNameIncludingTypeParameters(boolean staticForm, ImportRegistrationResolver resolver, Map<String, String> types) {
172172 if (DataType.PRIMITIVE == dataType) {
173 Assert.isTrue(parameters.size() == 0, "A primitive cannot have parameters");
173 Assert.isTrue(parameters.isEmpty(), "A primitive cannot have parameters");
174174 if (this.fullyQualifiedTypeName.equals(Integer.class.getName())) {
175175 return "int" + getArraySuffix();
176176 } else if (this.fullyQualifiedTypeName.equals(Character.class.getName())) {
shell/src/main/java/org/springframework/roo/shell/SimpleParser.java
(2 / 2)
  
418418
419419 // logger.info("RESULTS: '" + translated + "' " + StringUtils.collectionToCommaDelimitedString(targets));
420420
421 if (targets.size() == 0) {
421 if (targets.isEmpty()) {
422422 // Nothing matches the buffer they've presented
423423 return cursor;
424424 }
……
472472 }
473473
474474 // If they haven't specified any parameters yet, at least verify the command name is fully completed
475 if (options.size() == 0) {
475 if (options.isEmpty()) {
476476 for (String value : cmd.value()) {
477477 if (value.startsWith(buffer)) {
478478 // They are potentially trying to type this command
support/src/main/java/org/springframework/roo/support/logging/HandlerUtils.java
(1 / 1)
  
6868 }
6969
7070 // Create a default DeferredLogHandler if no Handler was defined in the presented Logger
71 if (newHandlers.size() == 0) {
71 if (newHandlers.isEmpty()) {
7272 ConsoleHandler consoleHandler = new ConsoleHandler();
7373 consoleHandler.setFormatter(new Formatter() {
7474 public String format(LogRecord record) {
uaa/src/main/java/org/springframework/roo/uaa/UaaRegistrationServiceImpl.java
(1 / 1)
  
155155 }
156156
157157 public void flushIfPossible() {
158 if (bsnBuffer.size() == 0 && projectIdBuffer.size() == 0) {
158 if (bsnBuffer.isEmpty() && projectIdBuffer.isEmpty()) {
159159 // Nothing to flush
160160 return;
161161 }

Comments

Add a new comment:

Login or create an account to post a comment

Add your comment