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/01/23 10:57:46 UTC
[isis] 09/10: ISIS-1841 cleanup some compiler warnings
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch ISIS-1846_internal_utils
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7d5b53832b55f0125f4f7998b187e1b415d6258f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 23 11:00:52 2018 +0100
ISIS-1841 cleanup some compiler warnings
---
.../org/apache/isis/applib/AppManifestAbstract.java | 3 ++-
.../java/org/apache/isis/applib/IsisApplibModule.java | 5 ++++-
.../applib/fixturescripts/BuilderScriptAbstract.java | 4 ++--
.../isis/applib/fixturescripts/FixtureScript.java | 3 ++-
.../exceptions/package-info.java} | 13 +++++++------
.../applib/layout/grid/bootstrap3/BS3ClearFix.java | 1 +
.../layout/grid/bootstrap3/BS3ElementAbstract.java | 1 +
.../isis/applib/layout/grid/bootstrap3/BS3Grid.java | 2 +-
.../isis/applib/layout/menubars/MenuBarsAbstract.java | 1 +
.../apache/isis/schema/utils/InteractionDtoUtils.java | 19 ++++++++++---------
10 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
index e9fe96a..63a074a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
@@ -211,7 +211,8 @@ public abstract class AppManifestAbstract implements AppManifest {
return self();
}
- public B withFixtureScripts(final Class<? extends FixtureScript>... fixtures) {
+ @SuppressWarnings("unchecked") // at least type-safety applies
+ public B withFixtureScripts(final Class<? extends FixtureScript>... fixtures) {
return withFixtureScripts(Arrays.asList(fixtures));
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
index dd27a03..5ef90ac 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/IsisApplibModule.java
@@ -22,14 +22,17 @@ public final class IsisApplibModule {
private IsisApplibModule(){}
- public abstract static class ActionDomainEvent<S> extends org.apache.isis.applib.services.eventbus.ActionDomainEvent<S> {
+ @SuppressWarnings("serial") // serial versionId to be provided by concrete class
+ public abstract static class ActionDomainEvent<S> extends org.apache.isis.applib.services.eventbus.ActionDomainEvent<S> {
public ActionDomainEvent() {}
}
+ @SuppressWarnings("serial") // serial versionId to be provided by concrete class
public abstract static class CollectionDomainEvent<S,T> extends org.apache.isis.applib.services.eventbus.CollectionDomainEvent<S,T> {
public CollectionDomainEvent() { }
}
+ @SuppressWarnings("serial") // serial versionId to be provided by concrete class
public abstract static class PropertyDomainEvent<S,T> extends org.apache.isis.applib.services.eventbus.PropertyDomainEvent<S,T> {
public PropertyDomainEvent() { }
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java
index e4fc694..e185cf2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java
@@ -73,7 +73,7 @@ public abstract class BuilderScriptAbstract<T,F extends BuilderScriptAbstract<T,
public abstract T getObject();
- public <P extends PersonaWithBuilderScript<T, F>, T, F extends BuilderScriptAbstract<T,F>> T objectFor(
+ public <P extends PersonaWithBuilderScript<T, F>> T objectFor(
final P persona,
final FixtureScript.ExecutionContext ec) {
if(persona == null) {
@@ -83,7 +83,7 @@ public abstract class BuilderScriptAbstract<T,F extends BuilderScriptAbstract<T,
return ec.executeChildT(this, fixtureScript).getObject();
}
- public <P extends PersonaWithFinder<T>, T> T findUsing(final P persona) {
+ public <P extends PersonaWithFinder<T>> T findUsing(final P persona) {
if(persona == null) {
return null;
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 8ffe7ae..955cb50 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -925,7 +925,8 @@ public abstract class FixtureScript
/**
* Returns the first non-null value; for convenience of subclass implementations
*/
- protected static <T> T coalesce(final T... ts) {
+ @SafeVarargs
+ protected static <T> T coalesce(final T... ts) {
for (final T t : ts) {
if(t != null) return t;
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java b/core/applib/src/main/java/org/apache/isis/applib/internal/exceptions/package-info.java
similarity index 75%
copy from core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
copy to core/applib/src/main/java/org/apache/isis/applib/internal/exceptions/package-info.java
index acf64e9..8b79deb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/internal/exceptions/package-info.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.layout.grid.bootstrap3;
-
-public abstract class BS3ClearFix extends BS3RowContent {
-
- public abstract String toCssClass();
-}
+/**
+ * Internal classes, not intended as being part of the public API.
+ *
+ * WARNING: Do NOT use any of the classes provided by this package! <br/>
+ * Public access will be removed once we migrate to Java 9+ modules.
+ */
+package org.apache.isis.applib.internal.exceptions;
\ No newline at end of file
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
index acf64e9..ce50d68 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+@SuppressWarnings("serial") // serial versionId to be provided by concrete class
public abstract class BS3ClearFix extends BS3RowContent {
public abstract String toCssClass();
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ElementAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ElementAbstract.java
index ef0e312..233e261 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ElementAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ElementAbstract.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlAttribute;
/**
* Superclass for all layout classes, factoring out the common {@link #getCssClass()} attribute.
*/
+@SuppressWarnings("serial") // serial versionId to be provided by concrete class
public abstract class BS3ElementAbstract implements BS3Element {
private String cssClass;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
index 6661215..785beab 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
@@ -108,7 +108,7 @@ public class BS3Grid extends GridAbstract implements BS3Element, Dto, BS3RowOwne
-
+ //TODO [ahuber] unused
private BS3RowOwner owner;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
index e4bd77e..a2ff209 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
@@ -28,6 +28,7 @@ import com.google.common.collect.Maps;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
+@SuppressWarnings("serial") // serial versionId to be provided by concrete class
@XmlTransient // ignore this class
public abstract class MenuBarsAbstract implements MenuBars, Serializable {
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
index ccf48dd..f056398 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
@@ -315,15 +315,16 @@ public final class InteractionDtoUtils {
return invocation;
}
- private static PropertyEditDto propertyEditFor(final InteractionDto interactionDto) {
- PropertyEditDto edit = (PropertyEditDto) interactionDto.getExecution();
- if(edit == null) {
- edit = new PropertyEditDto();
- interactionDto.setExecution(edit);
- edit.setInteractionType(InteractionType.PROPERTY_EDIT);
- }
- return edit;
- }
+// TODO not used
+// private static PropertyEditDto propertyEditFor(final InteractionDto interactionDto) {
+// PropertyEditDto edit = (PropertyEditDto) interactionDto.getExecution();
+// if(edit == null) {
+// edit = new PropertyEditDto();
+// interactionDto.setExecution(edit);
+// edit.setInteractionType(InteractionType.PROPERTY_EDIT);
+// }
+// return edit;
+// }
private static List<ParamDto> parameterListFor(final InteractionDto ixnDto) {
return parameterListFor(actionInvocationFor(ixnDto));
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.