You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/04/14 13:16:53 UTC
[isis] branch master updated: ISIS-1841 further removing compiler
warnings
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 5ae385d ISIS-1841 further removing compiler warnings
5ae385d is described below
commit 5ae385dcff46deafae30171ec47862626edf8410
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Apr 14 15:16:48 2018 +0200
ISIS-1841 further removing compiler warnings
org.apache.commons.cli.BasicParser is deprecated, instead using
org.apache.commons.cli.DefaultParser
---
.../ExceptionRecognizerTranslate.java | 3 +-
.../isis/core/runtime/logging/SnapshotServer.java | 45 +++++++++++-----------
.../configbuilder/IsisConfigurationBuilder.java | 27 +++++++------
.../model/mementos/ObjectAdapterMemento.java | 5 ++-
.../viewer/wicket/model/models/ScalarModel.java | 6 +--
.../wicket/model/models/WicketComponentUtils.java | 3 +-
.../viewer/wicket/model/util/ComponentHintKey.java | 4 +-
7 files changed, 51 insertions(+), 42 deletions(-)
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
index 4a1f710..591d3b6 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
@@ -60,7 +60,8 @@ public class ExceptionRecognizerTranslate implements MethodRule {
private void recognize(final Throwable ex) {
final List<ExceptionRecognizer> exceptionRecognizers = getIsisSessionFactory().getServicesInjector().lookupServices(ExceptionRecognizer.class);
for (final ExceptionRecognizer exceptionRecognizer : exceptionRecognizers) {
- final String unused = exceptionRecognizer.recognize(ex);
+ @SuppressWarnings("unused")
+ final String unused = exceptionRecognizer.recognize(ex);
}
}
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
index 9d39508..10e866b 100644
--- a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
@@ -69,34 +69,35 @@ public class SnapshotServer {
fileName = prop.getProperty(prefix + "filename", "log-snapshot-");
extension = prop.getProperty(prefix + "extension", "txt");
- ServerSocket server;
- try {
- server = new ServerSocket(port);
- } catch (final IOException e) {
- LOG4J.error("failed to start server", e);
- return;
- }
+ try( final ServerSocket server = new ServerSocket(port) ) {
+
+ while (true) {
+ try {
+ final Socket s = server.accept();
- while (true) {
- try {
- final Socket s = server.accept();
+ LOG4J.info("receiving log from " + s.getInetAddress().getHostName());
- LOG4J.info("receiving log from " + s.getInetAddress().getHostName());
+ final BufferedReader in = new BufferedReader(new InputStreamReader(s.getInputStream(), "8859_1"));
- final BufferedReader in = new BufferedReader(new InputStreamReader(s.getInputStream(), "8859_1"));
+ final String message = in.readLine();
+ final SnapshotWriter w = new SnapshotWriter(directoryPath, fileName, extension, message);
+ String line;
+ while ((line = in.readLine()) != null) {
+ w.appendLog(line);
+ }
+ s.close();
- final String message = in.readLine();
- final SnapshotWriter w = new SnapshotWriter(directoryPath, fileName, extension, message);
- String line;
- while ((line = in.readLine()) != null) {
- w.appendLog(line);
+ in.close();
+ } catch (final IOException e) {
+ LOG4J.error("failed to log", e);
}
- s.close();
-
- in.close();
- } catch (final IOException e) {
- LOG4J.error("failed to log", e);
}
+
+ } catch (final IOException e) {
+ LOG4J.error("failed to start server", e);
+ return;
}
+
+
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
index ca050dd..255a4c6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/configbuilder/IsisConfigurationBuilder.java
@@ -25,17 +25,13 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
-import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
-
-import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.apache.isis.applib.util.ObjectContracts;
+import org.apache.isis.applib.util.ObjectContracts.ObjectContract;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
@@ -47,6 +43,10 @@ import org.apache.isis.core.commons.resource.ResourceStreamSourceChainOfResponsi
import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
import org.apache.isis.core.runtime.optionhandler.BootPrinter;
import org.apache.isis.core.runtime.optionhandler.OptionHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Sets;
/**
* Holds a mutable set of properties representing the configuration.
@@ -296,7 +296,7 @@ public final class IsisConfigurationBuilder {
private boolean parseAndPrimeWith(final Options options, final List<OptionHandler> optionHandlers, final String[] args) {
final BootPrinter printer = new BootPrinter(getClass());
- final CommandLineParser parser = new BasicParser();
+ final CommandLineParser parser = new DefaultParser();
try {
final CommandLine commandLine = parser.parse(options, args);
for (final OptionHandler optionHandler : optionHandlers) {
@@ -387,12 +387,15 @@ public final class IsisConfigurationBuilder {
}
}
+ private final static ObjectContract<IsisConfigurationBuilder> contract =
+ ObjectContracts.contract(IsisConfigurationBuilder.class)
+ .thenUse("resourceStream", x->x.resourceStreamSourceChain)
+ .thenUse("configResources", x->x.configurationResourcesFound)
+ ;
+
@Override
public String toString() {
- return Objects.toStringHelper(this)
- .add("resourceStream", resourceStreamSourceChain)
- .add("configResources", configurationResourcesFound)
- .toString();
+ return contract.toString(this);
}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
index ec940ea..b164e3a 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
@@ -351,7 +351,8 @@ public class ObjectAdapterMemento implements Serializable {
/**
* Populated only if {@link #getSort() sort} is {@link Sort#SCALAR scalar}
*/
- private String titleHint;
+ @SuppressWarnings("unused")
+ private String titleHint;
/**
* The current value, if {@link Type#ENCODEABLE}; will be <tt>null</tt> otherwise.
@@ -391,7 +392,7 @@ public class ObjectAdapterMemento implements Serializable {
private Memento transientMemento;
/**
- * opulated only if {@link #getSort() sort} is {@link Sort#VECTOR vector}
+ * populated only if {@link #getSort() sort} is {@link Sort#VECTOR vector}
*/
private ArrayList<ObjectAdapterMemento> list;
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 8ad74ca..fe52635 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -259,7 +259,7 @@ public class ScalarModel extends EntityModel implements LinksProvider,FormExecut
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
final BigDecimalValueFacet facet = property.getFacet(BigDecimalValueFacet.class);
- return facet != null? facet.getLength(): null;
+ return facet != null? facet.getPrecision(): null;
}
@Override
@@ -479,7 +479,7 @@ public class ScalarModel extends EntityModel implements LinksProvider,FormExecut
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
final BigDecimalValueFacet facet = actionParameter.getFacet(BigDecimalValueFacet.class);
- return facet != null? facet.getLength(): null;
+ return facet != null? facet.getPrecision(): null;
}
@Override
@@ -810,7 +810,7 @@ public class ScalarModel extends EntityModel implements LinksProvider,FormExecut
}
if(isCollection()) {
- final Iterable iterable = (Iterable) pojo;
+ final Iterable<?> iterable = (Iterable<?>) pojo;
final ArrayList<ObjectAdapterMemento> listOfMementos =
Lists.newArrayList(FluentIterable.from(iterable)
.transform(ObjectAdapterMemento.Functions.fromPojo(getPersistenceSession()))
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java
index 1fba4ed..d0d7953 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/WicketComponentUtils.java
@@ -16,6 +16,7 @@
*/
package org.apache.isis.viewer.wicket.model.models;
+import org.apache.isis.applib.internal.base._Casts;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.markup.renderStrategy.DeepChildFirstVisitor;
@@ -51,7 +52,7 @@ public class WicketComponentUtils {
}
});
- return (T) pComponent[0];
+ return _Casts.uncheckedCast(pComponent[0]);
}
}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
index fcb5366..63f3d58 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
@@ -123,7 +123,9 @@ public class ComponentHintKey implements Serializable {
public static ComponentHintKey noop() {
return new ComponentHintKey(null, null, null, null) {
- @Override
+ private static final long serialVersionUID = 1L;
+
+ @Override
public String getKey() {
return null;
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.