From c5c939bbce9396050f8d8915f8046a25d4aa126a Mon Sep 17 00:00:00 2001 From: David Sowerby Date: Thu, 18 Feb 2016 19:13:18 +0000 Subject: [PATCH 1/4] Corrected Travis reference in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 92a779c17..6188ae9e8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![License](http://img.shields.io/:license-apache-blue.svg) [![Gitter](https://badges.gitter.im/davidsowerby/krail.svg)](https://gitter.im/davidsowerby/krail?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -[![Build Status](https://travis-ci.org/davidsowerby/krailkrail.svg?branch=master)](https://travis-ci.org/davidsowerby/krail) +[![Build Status](https://travis-ci.org/davidsowerby/krail.svg?branch=master)](https://travis-ci.org/davidsowerby/krail) [![Coverage Status](https://coveralls.io/repos/github/davidsowerby/krail/badge.svg?branch=master)](https://coveralls.io/github/davidsowerby/krail?branch=master) Krail provides a framework for rapid Java web development by combining Vaadin, Guice, Apache Shiro, Apache Commons Configuration and others. For more information, see the comprehensive [Tutorial](http://krail.readthedocs.org/en/master/), which also makes a reasonable demo. (You can clone directly from the [Tutorial repo](https://github.com/davidsowerby/krail-tutorial)) From 229c9a0b9d59f835bb353763749e3230a81ab04a Mon Sep 17 00:00:00 2001 From: sureshbabuinfo Date: Wed, 8 Jun 2016 22:40:18 +0530 Subject: [PATCH 2/4] Fixed MessageFormat which is not working when the same argument is repeated --- src/main/java/uk/q3c/util/MessageFormat.java | 19 ++++++++++--------- .../java/uk/q3c/util/MessageFormatTest.java | 16 ++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/java/uk/q3c/util/MessageFormat.java b/src/main/java/uk/q3c/util/MessageFormat.java index 67593b6e1..12070c67a 100644 --- a/src/main/java/uk/q3c/util/MessageFormat.java +++ b/src/main/java/uk/q3c/util/MessageFormat.java @@ -115,16 +115,17 @@ private static String scanForParameters(String pattern, List parameters } private static Object[] sortArguments(List parameters, Object[] arguments, String pattern) { - if (parameters.size() != arguments.length) { - Object[] args = new Object[]{parameters.size(), arguments.length, pattern}; - log.warn("Message pattern and arguments do not match, there are {} parameters in the pattern, " + - "and {} arguments. The pattern is: '{}'", args); + try { + List sortedArguments = new ArrayList<>(); + for (Integer i : parameters) { + sortedArguments.add(arguments[i]); + } + return sortedArguments.toArray(); + } catch (IndexOutOfBoundsException e) { + Object[] args = new Object[] { parameters.size(), arguments.length, pattern }; + log.warn("Message pattern and arguments do not match, there are {} parameters in the pattern, " + + "and {} arguments. The pattern is: '{}'", args); throw new RuntimeException(); } - List sortedArguments = new ArrayList<>(); - for (Integer i : parameters) { - sortedArguments.add(arguments[i]); - } - return sortedArguments.toArray(); } } diff --git a/src/test/java/uk/q3c/util/MessageFormatTest.java b/src/test/java/uk/q3c/util/MessageFormatTest.java index ec7b9c8cf..139d328dc 100644 --- a/src/test/java/uk/q3c/util/MessageFormatTest.java +++ b/src/test/java/uk/q3c/util/MessageFormatTest.java @@ -16,6 +16,9 @@ import static org.assertj.core.api.Assertions.assertThat; +import java.util.ArrayList; +import java.util.List; + public class MessageFormatTest { @Test public void formatValid() { @@ -29,7 +32,20 @@ public void formatValid() { assertThat(result).isEqualTo("This is a simple pattern where the parameters can be in any order"); } + + @Test + public void formatValidRepeatedArgument() { + + // given + String pattern = "This is a {0} pattern where the same argument is {0}"; + Object[] arguments = new Object[]{"repeated"}; + // when + String result = MessageFormat.format(pattern, arguments); + // then + assertThat(result).isEqualTo("This is a repeated pattern where the same argument is repeated"); + } + @Test public void formatValidContiguous() { From c48cd5c8db6b2c12630b78d31e4979e53be8015b Mon Sep 17 00:00:00 2001 From: David Sowerby Date: Thu, 9 Jun 2016 16:55:39 +0100 Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"Fixed=20MessageFormat=20=20which?= =?UTF-8?q?=20is=20not=20working=20when=20the=20same=20argument=20is=20r?= =?UTF-8?q?=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/uk/q3c/util/MessageFormat.java | 19 +++++++++---------- .../java/uk/q3c/util/MessageFormatTest.java | 16 ---------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/main/java/uk/q3c/util/MessageFormat.java b/src/main/java/uk/q3c/util/MessageFormat.java index 12070c67a..67593b6e1 100644 --- a/src/main/java/uk/q3c/util/MessageFormat.java +++ b/src/main/java/uk/q3c/util/MessageFormat.java @@ -115,17 +115,16 @@ private static String scanForParameters(String pattern, List parameters } private static Object[] sortArguments(List parameters, Object[] arguments, String pattern) { - try { - List sortedArguments = new ArrayList<>(); - for (Integer i : parameters) { - sortedArguments.add(arguments[i]); - } - return sortedArguments.toArray(); - } catch (IndexOutOfBoundsException e) { - Object[] args = new Object[] { parameters.size(), arguments.length, pattern }; - log.warn("Message pattern and arguments do not match, there are {} parameters in the pattern, " - + "and {} arguments. The pattern is: '{}'", args); + if (parameters.size() != arguments.length) { + Object[] args = new Object[]{parameters.size(), arguments.length, pattern}; + log.warn("Message pattern and arguments do not match, there are {} parameters in the pattern, " + + "and {} arguments. The pattern is: '{}'", args); throw new RuntimeException(); } + List sortedArguments = new ArrayList<>(); + for (Integer i : parameters) { + sortedArguments.add(arguments[i]); + } + return sortedArguments.toArray(); } } diff --git a/src/test/java/uk/q3c/util/MessageFormatTest.java b/src/test/java/uk/q3c/util/MessageFormatTest.java index 139d328dc..ec7b9c8cf 100644 --- a/src/test/java/uk/q3c/util/MessageFormatTest.java +++ b/src/test/java/uk/q3c/util/MessageFormatTest.java @@ -16,9 +16,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import java.util.ArrayList; -import java.util.List; - public class MessageFormatTest { @Test public void formatValid() { @@ -32,20 +29,7 @@ public void formatValid() { assertThat(result).isEqualTo("This is a simple pattern where the parameters can be in any order"); } - - @Test - public void formatValidRepeatedArgument() { - - // given - String pattern = "This is a {0} pattern where the same argument is {0}"; - Object[] arguments = new Object[]{"repeated"}; - // when - String result = MessageFormat.format(pattern, arguments); - // then - assertThat(result).isEqualTo("This is a repeated pattern where the same argument is repeated"); - } - @Test public void formatValidContiguous() { From 6a727af35a4ff9bfba77de5864e03e9831c42c41 Mon Sep 17 00:00:00 2001 From: Soso Tughushi Date: Fri, 1 Jul 2016 23:56:27 +0400 Subject: [PATCH 4/4] Fixed rule 'Sections of code should not be commented out' --- .../krail/core/i18n/DefaultCurrentLocale.java | 1 - .../q3c/krail/core/i18n/DefaultTranslate.java | 1 - .../navigate/StandardPageMappingReader.java | 4 -- .../sitemap/DefaultMasterSitemap.java | 1 - .../sitemap/DefaultSitemapFinisher.java | 1 - .../navigate/sitemap/DefaultUserSitemap.java | 3 - .../navigate/sitemap/StandardPagesModule.java | 3 - .../krail/core/shiro/DefaultShiroModule.java | 2 +- .../krail/core/shiro/KrailErrorHandler.java | 1 - .../uk/q3c/krail/core/sysadmin/I18NView.java | 56 ------------------- .../core/sysadmin/SitemapReportView.java | 1 - .../core/sysadmin/option/SourcePanel.java | 2 - .../component/DefaultUserStatusPanel.java | 1 - .../testutil/i18n/MockCurrentLocale.java | 1 - .../java/uk/q3c/util/SourceTreeWrapper.java | 9 --- .../util/SourceTreeWrapper_BasicForest.java | 10 ---- .../java/fixture/ReferenceUserSitemap.java | 5 -- .../fixture/testviews2/My_AccountView.java | 1 - .../java/fixture/testviews2/PrivateView.java | 1 - src/test/java/fixture/testviews2/ViewA1.java | 1 - src/test/java/fixture/testviews2/ViewA11.java | 1 - .../java/fixture/testviews2/ViewA111.java | 1 - .../fixture/testviews2/WigglyHomeView.java | 1 - .../core/guice/DefaultBindingManagerTest.java | 2 - .../krail/core/guice/uiscope/UIScopeTest.java | 1 - .../core/i18n/DefaultCurrentLocaleTest.java | 2 - .../core/i18n/DefaultI18NProcessorTest.java | 5 -- .../core/navigate/DefaultNavigatorTest.java | 2 - .../core/navigate/LabelKeyForNameTest.java | 12 ---- .../sitemap/DefaultMasterSitemapTest.java | 3 - .../navigate/sitemap/TestWithSitemap.java | 1 - .../q3c/krail/core/option/OptionKeyTest.java | 11 ---- .../option/cache/DefaultOptionCacheTest.java | 10 ---- .../uk/q3c/krail/core/ui/ScopedUITest.java | 2 - .../krail/core/view/ScopeAndInjectTest.java | 2 - .../testviews/subview/MoneyInOutView.java | 1 - .../view/testviews/subview/TransferView.java | 1 - .../TargetTreeWrapper_BasicForestTest.java | 4 -- .../util/TargetTreeWrapper_MenuBarTest.java | 11 ---- .../TargetTreeWrapper_VaadinTreeTest.java | 8 --- 40 files changed, 1 insertion(+), 185 deletions(-) diff --git a/src/main/java/uk/q3c/krail/core/i18n/DefaultCurrentLocale.java b/src/main/java/uk/q3c/krail/core/i18n/DefaultCurrentLocale.java index 6c917b61d..06db42720 100644 --- a/src/main/java/uk/q3c/krail/core/i18n/DefaultCurrentLocale.java +++ b/src/main/java/uk/q3c/krail/core/i18n/DefaultCurrentLocale.java @@ -173,7 +173,6 @@ public void setLocale(Locale locale, boolean fireListeners) { if (locale != this.locale) { this.locale = locale; - // Locale.setDefault(locale); log.debug("CurrentLocale set to {}", locale); if (fireListeners) { log.debug("publish locale change"); diff --git a/src/main/java/uk/q3c/krail/core/i18n/DefaultTranslate.java b/src/main/java/uk/q3c/krail/core/i18n/DefaultTranslate.java index 7eb9accc9..72586c35d 100644 --- a/src/main/java/uk/q3c/krail/core/i18n/DefaultTranslate.java +++ b/src/main/java/uk/q3c/krail/core/i18n/DefaultTranslate.java @@ -96,7 +96,6 @@ public String from(boolean checkLocaleIsSupported, @Nullable I18NKey key, @Nonnu if (key == null) { return "key is null"; } - // E k = typeBridge(key); String pattern = patternSource.retrievePattern((Enum) key, locale); diff --git a/src/main/java/uk/q3c/krail/core/navigate/StandardPageMappingReader.java b/src/main/java/uk/q3c/krail/core/navigate/StandardPageMappingReader.java index 84013a58d..282f3dc82 100644 --- a/src/main/java/uk/q3c/krail/core/navigate/StandardPageMappingReader.java +++ b/src/main/java/uk/q3c/krail/core/navigate/StandardPageMappingReader.java @@ -39,10 +39,6 @@ public PageRecord deconstruct(String line, int lineNumber) { syntaxErrors.add(missingLabelKeyMsg + " at line " + lineNumber); return null; } - // if (!line.contains(":")) { - // syntaxErrors.add(missingViewMsg + " at line " + lineNumber); - // return null; - // } if (!line.contains("=")) { syntaxErrors.add(missingUriMsg + " at line " + lineNumber); return null; diff --git a/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultMasterSitemap.java b/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultMasterSitemap.java index 674d1969d..ec062e472 100644 --- a/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultMasterSitemap.java +++ b/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultMasterSitemap.java @@ -44,7 +44,6 @@ public synchronized MasterSitemapNode append(NodeRecord nodeRecord) { // find the node (parent) to attach to, by looping and removing the trailing segment each // time until we find a matching node or run out of segments List segments = new ArrayList(navState.getPathSegments()); -// segments.remove(segments.size() - 1); MasterSitemapNode node = null; while ((segments.size() > 0) && (node == null)) { diff --git a/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultSitemapFinisher.java b/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultSitemapFinisher.java index 8cc3245ff..de27bfecd 100644 --- a/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultSitemapFinisher.java +++ b/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultSitemapFinisher.java @@ -211,7 +211,6 @@ private void redirectCheck(MasterSitemap sitemap) { } catch (CycleDetectedException cde) { String msg = MessageFormat.format("Redirecting {0} to {1} would cause a loop", entry.getKey(), entry.getValue()); redirectLoops.add(msg); - // throw new CycleDetectedException(msg); } } diff --git a/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultUserSitemap.java b/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultUserSitemap.java index de9df2f85..27d91dcd0 100644 --- a/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultUserSitemap.java +++ b/src/main/java/uk/q3c/krail/core/navigate/sitemap/DefaultUserSitemap.java @@ -133,9 +133,6 @@ public synchronized void buildUriMap() { public boolean hasNoVisibleChildren(@Nonnull UserSitemapNode sourceNode) { checkNotNull(sourceNode); List children = this.getChildren(sourceNode); -// if (children == null) { //FindBugs reports this unnecessary -// return true; -// } for (UserSitemapNode child : children) { if (child.getPositionIndex() >= 0) { return false; diff --git a/src/main/java/uk/q3c/krail/core/navigate/sitemap/StandardPagesModule.java b/src/main/java/uk/q3c/krail/core/navigate/sitemap/StandardPagesModule.java index 51dadb598..586412795 100644 --- a/src/main/java/uk/q3c/krail/core/navigate/sitemap/StandardPagesModule.java +++ b/src/main/java/uk/q3c/krail/core/navigate/sitemap/StandardPagesModule.java @@ -19,9 +19,6 @@ public class StandardPagesModule extends DirectSitemapModule { - // private MapBinder mapBinder; - // private MapBinder redirectBinder; - /** * Override this method to define different {@link MasterSitemap} entries for Standard Pages. All of the views * specified diff --git a/src/main/java/uk/q3c/krail/core/shiro/DefaultShiroModule.java b/src/main/java/uk/q3c/krail/core/shiro/DefaultShiroModule.java index b3d9d07b2..5e8fccfbb 100644 --- a/src/main/java/uk/q3c/krail/core/shiro/DefaultShiroModule.java +++ b/src/main/java/uk/q3c/krail/core/shiro/DefaultShiroModule.java @@ -1,4 +1,4 @@ -/* + /* * * * Copyright (c) 2016. David Sowerby * * diff --git a/src/main/java/uk/q3c/krail/core/shiro/KrailErrorHandler.java b/src/main/java/uk/q3c/krail/core/shiro/KrailErrorHandler.java index 6d2854522..ac7ad1df8 100644 --- a/src/main/java/uk/q3c/krail/core/shiro/KrailErrorHandler.java +++ b/src/main/java/uk/q3c/krail/core/shiro/KrailErrorHandler.java @@ -38,7 +38,6 @@ public class KrailErrorHandler extends DefaultErrorHandler { private final NotAGuestExceptionHandler notAGuestExceptionHandler; private final NotAUserExceptionHandler notAUserExceptionHandler; private final UnauthorizedExceptionHandler authorisationHandler; - // private final InvalidURIHandler invalidUriHandler; private final Navigator navigator; private UserNotifier userNotifier; diff --git a/src/main/java/uk/q3c/krail/core/sysadmin/I18NView.java b/src/main/java/uk/q3c/krail/core/sysadmin/I18NView.java index 8e94b8d01..961a00211 100644 --- a/src/main/java/uk/q3c/krail/core/sysadmin/I18NView.java +++ b/src/main/java/uk/q3c/krail/core/sysadmin/I18NView.java @@ -96,24 +96,6 @@ protected void doBuild(ViewChangeBusMessage busMessage) { protected void export() { userNotifier.notifyInformation(LabelKey.This_feature_has_not_been_implemented); - // exportStatus.setValue(""); - // Optional writerOpt = findWriter(); - // Set locales = retrieveLocales(); - // if (locales.isEmpty()) { - // userNotifier.notifyInformation(MessageKey.There_are_no_Locales_to_process); - // return; - // } - // if (writerOpt.isPresent()) { - // try { - // patternUtility.writeExclusive(locales, writerOpt.get()); - // exportStatus.setValue(translate.from(MessageKey.Keys_exported, writerOpt.get() - // .count(), locales.size())); - // userNotifier.notifyInformation(LabelKey.Export_complete); - // } catch (Exception e) { - // log.info("Export I18NKeys failed due to exception", e); - // userNotifier.notifyError(MessageKey.I18NKey_export_failed, e.getMessage()); - // } - // } } @Handler @@ -123,43 +105,5 @@ public void localeChanged(LocaleChangeBusMessage busMessage) { instructions2.setValue('\n' + translate.from(MessageKey.All_Keys_exported)); } - // private Optional findWriter() { - // exportStatus.setValue(translate.from(LabelKey.Looking_for_Database_Writer)); - // Reflections reflections = new Reflections(); - // final Set> writers = reflections.getSubTypesOf(DatabaseBundleWriter.class); - // writers.remove(DatabaseBundleWriterBase.class); - // if (writers.size() == 1) { - // return Optional.of(injector.getInstance(writers.iterator() - // .next())); - // } - // if (writers.size() == 0) { - // userNotifier.notifyWarning(MessageKey.Needs_at_least_one_database_writer); - // return Optional.empty(); - // } - // userNotifier.notifyWarning(MessageKey.Currently_limited_to_supporting_one_database_writer); - // return Optional.empty(); - // } - -// @Nonnull -// protected Set retrieveLocales() { -// exportStatus.setValue(translate.from(LabelKey.Retrieving_Locales)); -// String userInput = localeList.getValue(); -// List localeTags = Splitter.on("\n") -// .trimResults() -// .omitEmptyStrings() -// .splitToList(userInput); -// Set locales = new HashSet<>(); -// localeTags.forEach(tag -> { -// try { -// Locale locale = new Locale.Builder().setLanguageTag(tag) -// .build(); -// locales.add(locale); -// } catch (IllformedLocaleException e) { -// userNotifier.notifyWarning(MessageKey.Invalid_Locale_Langugage_Tag, tag); -// } -// }); -// return locales; -// } - } diff --git a/src/main/java/uk/q3c/krail/core/sysadmin/SitemapReportView.java b/src/main/java/uk/q3c/krail/core/sysadmin/SitemapReportView.java index cde6eb987..860670692 100644 --- a/src/main/java/uk/q3c/krail/core/sysadmin/SitemapReportView.java +++ b/src/main/java/uk/q3c/krail/core/sysadmin/SitemapReportView.java @@ -48,7 +48,6 @@ protected SitemapReportView(MasterSitemap masterSitemap, Translate translate) { protected void doBuild(ViewChangeBusMessage busMessage) { super.doBuild(busMessage); reportArea = new TextArea(); - // reportArea.setEnabled(false); reportArea.setSizeFull(); reportArea.setValue(masterSitemap.getReport()); setCentreCell(reportArea); diff --git a/src/main/java/uk/q3c/krail/core/sysadmin/option/SourcePanel.java b/src/main/java/uk/q3c/krail/core/sysadmin/option/SourcePanel.java index f4bc3494d..aa5539a47 100644 --- a/src/main/java/uk/q3c/krail/core/sysadmin/option/SourcePanel.java +++ b/src/main/java/uk/q3c/krail/core/sysadmin/option/SourcePanel.java @@ -124,13 +124,11 @@ protected SourcePanel(Translate translate, OptionSource optionSource, Option opt } private void styles() { -// String defaultCaptionStyleName = option.get(defaultCaptionStyleOptionKey); applyStyle(nameCaption, nameCaptionStyleOptionKey); applyStyle(descriptionCaption, descriptionCaptionStyleOptionKey); applyStyle(connectionUrlCaption, connectionUrlCaptionStyleOptionKey); applyStyle(volatileCaption, is_volatileCaptionStyleOptionKey); -// String defaultValueStyleName = option.get(defaultValueStyleOptionKey); applyStyle(nameLabel, nameValueStyleOptionKey); applyStyle(descriptionLabel, descriptionValueStyleOptionKey); applyStyle(connectionUrlLabel, connectionUrlValueStyleOptionKey); diff --git a/src/main/java/uk/q3c/krail/core/view/component/DefaultUserStatusPanel.java b/src/main/java/uk/q3c/krail/core/view/component/DefaultUserStatusPanel.java index c427dc234..7e5bbf8ba 100644 --- a/src/main/java/uk/q3c/krail/core/view/component/DefaultUserStatusPanel.java +++ b/src/main/java/uk/q3c/krail/core/view/component/DefaultUserStatusPanel.java @@ -72,7 +72,6 @@ protected DefaultUserStatusPanel(Navigator navigator, SubjectProvider subjectPro this.subjectIdentifier = subjectIdentifier; this.eventBus = eventBusProvider.get(); this.currentLocale = currentLocale; - // eventBus.subscribe(this); setSizeFull(); addStyleName(ChameleonTheme.PANEL_BORDERLESS); usernameLabel = new Label(); diff --git a/src/main/java/uk/q3c/krail/testutil/i18n/MockCurrentLocale.java b/src/main/java/uk/q3c/krail/testutil/i18n/MockCurrentLocale.java index d21c93009..664ecdd51 100644 --- a/src/main/java/uk/q3c/krail/testutil/i18n/MockCurrentLocale.java +++ b/src/main/java/uk/q3c/krail/testutil/i18n/MockCurrentLocale.java @@ -56,7 +56,6 @@ public void setLocale(Locale locale, boolean fireListeners) { if (locale != this.locale) { this.locale = locale; - // Locale.setDefault(locale); log.debug("CurrentLocale set to {}", locale); if (fireListeners) { log.debug("publish locale change"); diff --git a/src/main/java/uk/q3c/util/SourceTreeWrapper.java b/src/main/java/uk/q3c/util/SourceTreeWrapper.java index 50b3a35b4..ed6b8cb3c 100644 --- a/src/main/java/uk/q3c/util/SourceTreeWrapper.java +++ b/src/main/java/uk/q3c/util/SourceTreeWrapper.java @@ -29,10 +29,6 @@ */ public interface SourceTreeWrapper { - // public abstract boolean hasChildren(N parentNode); - - // public abstract int getChildCount(N parentNode); - public abstract List getRoots(); /** @@ -44,15 +40,10 @@ public interface SourceTreeWrapper { */ public abstract List getChildren(N parentNode); - // public abstract void addNode(N parentNode, N childNode); - /** * Called by {@link TreeCopy} to offer the chance to mark this node as not having any children. Not used by all * implementations * * @param isLeaf */ - // public abstract void setLeaf(N parentNode, boolean isLeaf); - - // public boolean hasParent(N childNode); } diff --git a/src/main/java/uk/q3c/util/SourceTreeWrapper_BasicForest.java b/src/main/java/uk/q3c/util/SourceTreeWrapper_BasicForest.java index 664ef252b..35eb4e1db 100644 --- a/src/main/java/uk/q3c/util/SourceTreeWrapper_BasicForest.java +++ b/src/main/java/uk/q3c/util/SourceTreeWrapper_BasicForest.java @@ -18,21 +18,11 @@ public class SourceTreeWrapper_BasicForest implements SourceTreeWrapper { private final BasicForest forest; - // private NodeModifier nodeModifier = new DefaultNodeModifier(); - public SourceTreeWrapper_BasicForest(BasicForest forest) { super(); this.forest = forest; } - // public NodeModifier getNodeModifier() { - // return nodeModifier; - // } - - // public void setNodeModifier(NodeModifier nodeModifier) { - // this.nodeModifier = nodeModifier; - // } - @Override public List getRoots() { return forest.getRoots(); diff --git a/src/test/java/fixture/ReferenceUserSitemap.java b/src/test/java/fixture/ReferenceUserSitemap.java index 78d60b4ea..8b561071e 100644 --- a/src/test/java/fixture/ReferenceUserSitemap.java +++ b/src/test/java/fixture/ReferenceUserSitemap.java @@ -210,11 +210,6 @@ private void createStandardPages() { addChild(publicNode, loginNode); addChild(publicNode, logoutNode); addChild(privateNode, privateHomeNode); - - // addStandardPage(StandardPageKey.Log_In, loginNode); - // addStandardPage(StandardPageKey.Log_Out, logoutNode); - // addStandardPage(StandardPageKey.Public_Home, publicHomeNode); - // addStandardPage(StandardPageKey.Private_Home, privateHomeNode); } public UserSitemapNode createNode(String fullURI, String uriSegment, Class viewClass, I18NKey labelKey, PageAccessControl diff --git a/src/test/java/fixture/testviews2/My_AccountView.java b/src/test/java/fixture/testviews2/My_AccountView.java index e0ff7c8d9..c5452eb20 100644 --- a/src/test/java/fixture/testviews2/My_AccountView.java +++ b/src/test/java/fixture/testviews2/My_AccountView.java @@ -34,7 +34,6 @@ public void buildView(ViewChangeBusMessage busMessage) { @Override public Component getRootComponent() { - // return null; throw new RuntimeException("not yet implemented"); } diff --git a/src/test/java/fixture/testviews2/PrivateView.java b/src/test/java/fixture/testviews2/PrivateView.java index 54f3fb84f..87d5e6801 100644 --- a/src/test/java/fixture/testviews2/PrivateView.java +++ b/src/test/java/fixture/testviews2/PrivateView.java @@ -31,7 +31,6 @@ public void buildView(ViewChangeBusMessage busMessage) { @Override public Component getRootComponent() { - // return null; throw new RuntimeException("not yet implemented"); } diff --git a/src/test/java/fixture/testviews2/ViewA1.java b/src/test/java/fixture/testviews2/ViewA1.java index 5b0ba741d..49187be8c 100644 --- a/src/test/java/fixture/testviews2/ViewA1.java +++ b/src/test/java/fixture/testviews2/ViewA1.java @@ -33,7 +33,6 @@ public void buildView(ViewChangeBusMessage busMessage) { @Override public Component getRootComponent() { - // return null; throw new RuntimeException("not yet implemented"); } diff --git a/src/test/java/fixture/testviews2/ViewA11.java b/src/test/java/fixture/testviews2/ViewA11.java index d1db81f5f..a2ce3ab3c 100644 --- a/src/test/java/fixture/testviews2/ViewA11.java +++ b/src/test/java/fixture/testviews2/ViewA11.java @@ -33,7 +33,6 @@ public void buildView(ViewChangeBusMessage busMessage) { @Override public Component getRootComponent() { - // return null; throw new RuntimeException("not yet implemented"); } diff --git a/src/test/java/fixture/testviews2/ViewA111.java b/src/test/java/fixture/testviews2/ViewA111.java index dd2b9bb82..f8e3e42b7 100644 --- a/src/test/java/fixture/testviews2/ViewA111.java +++ b/src/test/java/fixture/testviews2/ViewA111.java @@ -33,7 +33,6 @@ public void buildView(ViewChangeBusMessage busMessage) { @Override public Component getRootComponent() { - // return null; throw new RuntimeException("not yet implemented"); } diff --git a/src/test/java/fixture/testviews2/WigglyHomeView.java b/src/test/java/fixture/testviews2/WigglyHomeView.java index 4d4b5c1b9..3c19355fa 100644 --- a/src/test/java/fixture/testviews2/WigglyHomeView.java +++ b/src/test/java/fixture/testviews2/WigglyHomeView.java @@ -33,7 +33,6 @@ public void buildView(ViewChangeBusMessage busMessage) { @Override public Component getRootComponent() { - // return null; throw new RuntimeException("not yet implemented"); } diff --git a/src/test/java/uk/q3c/krail/core/guice/DefaultBindingManagerTest.java b/src/test/java/uk/q3c/krail/core/guice/DefaultBindingManagerTest.java index a66a42511..314f364d0 100644 --- a/src/test/java/uk/q3c/krail/core/guice/DefaultBindingManagerTest.java +++ b/src/test/java/uk/q3c/krail/core/guice/DefaultBindingManagerTest.java @@ -78,8 +78,6 @@ public void setup() { @Test public void startAndStop() throws Exception { - //then -// assertThat(DefaultBindingManager.injector()).isNull(); // given TestBindingManager bindingManager = new TestBindingManager(); when(servletContextEvent.getServletContext()).thenReturn(servletContext); diff --git a/src/test/java/uk/q3c/krail/core/guice/uiscope/UIScopeTest.java b/src/test/java/uk/q3c/krail/core/guice/uiscope/UIScopeTest.java index eec7c6149..04214f25c 100644 --- a/src/test/java/uk/q3c/krail/core/guice/uiscope/UIScopeTest.java +++ b/src/test/java/uk/q3c/krail/core/guice/uiscope/UIScopeTest.java @@ -103,7 +103,6 @@ public void uiScope2() { // given KrailSecurityManager securityManager = new KrailSecurityManager(cacheManagerOpt); - // securityManager.setVaadinSessionProvider(vaadinSessionProvider); SecurityUtils.setSecurityManager(securityManager); diff --git a/src/test/java/uk/q3c/krail/core/i18n/DefaultCurrentLocaleTest.java b/src/test/java/uk/q3c/krail/core/i18n/DefaultCurrentLocaleTest.java index ed69b068c..ea5225214 100644 --- a/src/test/java/uk/q3c/krail/core/i18n/DefaultCurrentLocaleTest.java +++ b/src/test/java/uk/q3c/krail/core/i18n/DefaultCurrentLocaleTest.java @@ -245,7 +245,6 @@ public void setLocaleNoFire() { currentLocale.setLocale(Locale.FRANCE, false); // then assertThat(listenerFired).isFalse(); - // assertThat(Locale.getDefault()).isEqualTo(Locale.FRANCE); } @Test @@ -260,7 +259,6 @@ public void setLocaleFire() { currentLocale.setLocale(Locale.FRANCE, true); // then assertThat(listenerFired).isTrue(); - // assertThat(Locale.getDefault()).isEqualTo(Locale.FRANCE); } @Test diff --git a/src/test/java/uk/q3c/krail/core/i18n/DefaultI18NProcessorTest.java b/src/test/java/uk/q3c/krail/core/i18n/DefaultI18NProcessorTest.java index 5d400f361..cb7d5672b 100644 --- a/src/test/java/uk/q3c/krail/core/i18n/DefaultI18NProcessorTest.java +++ b/src/test/java/uk/q3c/krail/core/i18n/DefaultI18NProcessorTest.java @@ -92,7 +92,6 @@ public void interpret() { .getCaption()).isEqualTo("Ok"); assertThat(testObject.getLabel() .getDescription()).isEqualTo("Confirm this Value is Ok"); - // assertThat(testObject.getLabel().getValue()).isEqualTo("Ok"); assertThat(testObject.getLabel() .getLocale()).isEqualTo(Locale.UK); @@ -116,7 +115,6 @@ public void interpret() { assertThat(ccs.getCaption()).isEqualTo("Field"); assertThat(ccs.getLabelInsideTcc()).isNotNull(); Label label = ccs.getLabelInsideTcc(); - // assertThat(label.getValue()).isEqualTo("Ok"); assertThat(label.getDescription()).isEqualTo("Confirm this Value is Ok"); //drill down needed // class annotation @@ -124,12 +122,10 @@ public void interpret() { assertThat(ccc.getCaption()).isEqualTo("Class"); assertThat(ccc.getLabelInsideTcc()).isNotNull(); label = ccc.getLabelInsideTcc(); - // assertThat(label.getValue()).isEqualTo("Ok"); assertThat(label.getDescription()).isEqualTo("Confirm this Value is Ok"); // composite but not a component TestCompositeNonComponent cnc = testObject.getCnc(); - // assertThat(cnc.getLabel().getValue()).isEqualTo("Cancel"); // nested component TestCompositeComponentNested ccn = testObject.getCcn(); @@ -175,7 +171,6 @@ public void interpret_de() { .getCaption()).isEqualTo("OK"); assertThat(testObject.getLabel() .getDescription()).isEqualTo(confirmValueOk); - // assertThat(testObject.getLabel().getValue()).isEqualTo("Ok"); assertThat(testObject.getButtonWithAnnotation() .getLocale()).isEqualTo(Locale.GERMANY); diff --git a/src/test/java/uk/q3c/krail/core/navigate/DefaultNavigatorTest.java b/src/test/java/uk/q3c/krail/core/navigate/DefaultNavigatorTest.java index da01ee39b..03f8787ce 100644 --- a/src/test/java/uk/q3c/krail/core/navigate/DefaultNavigatorTest.java +++ b/src/test/java/uk/q3c/krail/core/navigate/DefaultNavigatorTest.java @@ -210,8 +210,6 @@ public void logout_rule_invoked() { public void login_rule_invoked() { // given - - // assertThat(loginNavigationRule.changedNavigationState(navigator,loginSource)).isNotNull(); navigator = createNavigator(); when(loginNavigationRule.changedNavigationState(navigator, loginSource)).thenReturn(Optional.empty()); // when diff --git a/src/test/java/uk/q3c/krail/core/navigate/LabelKeyForNameTest.java b/src/test/java/uk/q3c/krail/core/navigate/LabelKeyForNameTest.java index b896a8bec..f9f3fd402 100644 --- a/src/test/java/uk/q3c/krail/core/navigate/LabelKeyForNameTest.java +++ b/src/test/java/uk/q3c/krail/core/navigate/LabelKeyForNameTest.java @@ -22,18 +22,6 @@ public class LabelKeyForNameTest { - // @Test - // public void test() { - // List names = new ArrayList<>(); - // Class> enumClass = LabelKeys.class; - // Enum[] enums = enumClass.getEnumConstants(); - // for (Enum e : enums) { - // System.out.println(e.name()); - // names.add(e.name()); - // } - // - // } - @Test public void keyForName_good() { diff --git a/src/test/java/uk/q3c/krail/core/navigate/sitemap/DefaultMasterSitemapTest.java b/src/test/java/uk/q3c/krail/core/navigate/sitemap/DefaultMasterSitemapTest.java index d1789edfb..abaa76122 100644 --- a/src/test/java/uk/q3c/krail/core/navigate/sitemap/DefaultMasterSitemapTest.java +++ b/src/test/java/uk/q3c/krail/core/navigate/sitemap/DefaultMasterSitemapTest.java @@ -420,7 +420,6 @@ public void replace_standardKey_change() { MasterSitemapNode newParent = new MasterSitemapNode(2, "home", PublicHomeView.class, Public_Home, -1, AUTHENTICATION, null); sitemap.addChild(grandparent, parent); sitemap.addChild(parent, child); - // sitemap.addStandardPage(Public_Home, parent); //when sitemap.replaceNode(parent, newParent); //then @@ -440,7 +439,6 @@ public void replace_only_old_is_standard_page() { MasterSitemapNode newParent = new MasterSitemapNode(4, "home", PublicHomeView.class, TestLabelKey.Yes, -1, AUTHENTICATION, null); sitemap.addChild(grandparent, parent); sitemap.addChild(parent, child); - // sitemap.addStandardPage(Public_Home, parent); //when sitemap.replaceNode(parent, newParent); @@ -460,7 +458,6 @@ public void replace_only_new_is_standard_page() { MasterSitemapNode newParent = new MasterSitemapNode(2, "home", PublicHomeView.class, Public_Home, -1, AUTHENTICATION, null); sitemap.addChild(grandparent, parent); sitemap.addChild(parent, child); - // sitemap.addStandardPage(Public_Home, parent); //when sitemap.replaceNode(parent, newParent); //then diff --git a/src/test/java/uk/q3c/krail/core/navigate/sitemap/TestWithSitemap.java b/src/test/java/uk/q3c/krail/core/navigate/sitemap/TestWithSitemap.java index 81635cbdb..2f569fbdf 100644 --- a/src/test/java/uk/q3c/krail/core/navigate/sitemap/TestWithSitemap.java +++ b/src/test/java/uk/q3c/krail/core/navigate/sitemap/TestWithSitemap.java @@ -195,7 +195,6 @@ protected void buildMasterSitemap(int i) { } masterSitemap.lock(); -// masterSitemapQueue.addModel(masterSitemap); } diff --git a/src/test/java/uk/q3c/krail/core/option/OptionKeyTest.java b/src/test/java/uk/q3c/krail/core/option/OptionKeyTest.java index 44c6ccdce..914cec30b 100644 --- a/src/test/java/uk/q3c/krail/core/option/OptionKeyTest.java +++ b/src/test/java/uk/q3c/krail/core/option/OptionKeyTest.java @@ -54,17 +54,6 @@ public void null_context() { assertThat(true).isFalse(); } - //@Ignore(value = "Constructor doesn't allow null name key without compile error") - // @Test(expected = NullPointerException.class) - // public void null_key() { - // //given - // - // //when - // OptionKey noQualifiers = new OptionKey<>(22,LocaleContainer.class, LabelKey.Yes); - // //then - // assertThat(true).isFalse(); - // } - @Test public void qualifiedWith() { //given diff --git a/src/test/java/uk/q3c/krail/core/option/cache/DefaultOptionCacheTest.java b/src/test/java/uk/q3c/krail/core/option/cache/DefaultOptionCacheTest.java index da2c1cf56..17a585a7b 100644 --- a/src/test/java/uk/q3c/krail/core/option/cache/DefaultOptionCacheTest.java +++ b/src/test/java/uk/q3c/krail/core/option/cache/DefaultOptionCacheTest.java @@ -189,14 +189,4 @@ public void flush() { //then verify(cache2).invalidateAll(); } - //Moved to integration test, because cannot mock final class CacheStats - // @Test - // public void stats() { - // //given - // when(cache.stats()).thenReturn(stats); - // //when - // - // //then - // verify(cache).stats(); - // } } \ No newline at end of file diff --git a/src/test/java/uk/q3c/krail/core/ui/ScopedUITest.java b/src/test/java/uk/q3c/krail/core/ui/ScopedUITest.java index 44d08eba4..43880554c 100644 --- a/src/test/java/uk/q3c/krail/core/ui/ScopedUITest.java +++ b/src/test/java/uk/q3c/krail/core/ui/ScopedUITest.java @@ -194,8 +194,6 @@ public void init() { // then verify(session).setConverterFactory(converterFactory); InOrder inOrder = inOrder(currentLocale, navigator, translator, navigator); - // inOrder.verify(currentLocale) - // .setLocale(Locale.FRANCE, false); inOrder.verify(navigator) .init(); inOrder.verify(translator) diff --git a/src/test/java/uk/q3c/krail/core/view/ScopeAndInjectTest.java b/src/test/java/uk/q3c/krail/core/view/ScopeAndInjectTest.java index 0dcff0625..27a7a60a0 100644 --- a/src/test/java/uk/q3c/krail/core/view/ScopeAndInjectTest.java +++ b/src/test/java/uk/q3c/krail/core/view/ScopeAndInjectTest.java @@ -54,7 +54,6 @@ public void confirmUIScope() { Set> concreteTypes = new HashSet<>(); Set> noInject = new HashSet<>(); - // Set> noScope = new HashSet<>(); // when // remove interfaces, abstract classes and inner classes @@ -99,7 +98,6 @@ public void confirmUIScope() { // then - // assertThat(noScope).isEmpty(); assertThat(noInject).isEmpty(); } diff --git a/src/test/java/uk/q3c/krail/core/view/testviews/subview/MoneyInOutView.java b/src/test/java/uk/q3c/krail/core/view/testviews/subview/MoneyInOutView.java index 6bbc7f52b..054d8b1da 100644 --- a/src/test/java/uk/q3c/krail/core/view/testviews/subview/MoneyInOutView.java +++ b/src/test/java/uk/q3c/krail/core/view/testviews/subview/MoneyInOutView.java @@ -34,7 +34,6 @@ public void buildView(ViewChangeBusMessage event) { @Override public Component getRootComponent() { - // return null; throw new RuntimeException("not yet implemented"); } diff --git a/src/test/java/uk/q3c/krail/core/view/testviews/subview/TransferView.java b/src/test/java/uk/q3c/krail/core/view/testviews/subview/TransferView.java index 0f81245da..0ff5f638d 100644 --- a/src/test/java/uk/q3c/krail/core/view/testviews/subview/TransferView.java +++ b/src/test/java/uk/q3c/krail/core/view/testviews/subview/TransferView.java @@ -32,7 +32,6 @@ public void buildView(ViewChangeBusMessage event) { @Override public Component getRootComponent() { - // return null; throw new RuntimeException("not yet implemented"); } diff --git a/src/test/java/uk/q3c/util/TargetTreeWrapper_BasicForestTest.java b/src/test/java/uk/q3c/util/TargetTreeWrapper_BasicForestTest.java index fcb636bf5..982937dfb 100644 --- a/src/test/java/uk/q3c/util/TargetTreeWrapper_BasicForestTest.java +++ b/src/test/java/uk/q3c/util/TargetTreeWrapper_BasicForestTest.java @@ -28,8 +28,6 @@ public class TargetTreeWrapper_BasicForestTest { private BasicForest forest; private SourceTestNode sourceNodeA; private SourceTestNode sourceNodeB; - // private SourceTestNode sourceNodeC; - // private SourceTestNode sourceNodeD; private TargetTestNode targetNodeA; private TargetTestNode targetNodeB; private TargetTreeWrapper_BasicForest wrapper; @@ -39,8 +37,6 @@ public void setup() { forest = new BasicForest<>(); sourceNodeA = new SourceTestNode("sa"); sourceNodeB = new SourceTestNode("sb"); - // sourceNodeC = new SourceTestNode("sc"); - // sourceNodeD = new SourceTestNode("sd"); wrapper = new TargetTreeWrapper_BasicForest<>(forest); wrapper.setNodeModifier(new TestNodeModifier()); wrapper.setCaptionReader(captionReader); diff --git a/src/test/java/uk/q3c/util/TargetTreeWrapper_MenuBarTest.java b/src/test/java/uk/q3c/util/TargetTreeWrapper_MenuBarTest.java index d125bbe7e..e47c64b1f 100644 --- a/src/test/java/uk/q3c/util/TargetTreeWrapper_MenuBarTest.java +++ b/src/test/java/uk/q3c/util/TargetTreeWrapper_MenuBarTest.java @@ -23,15 +23,10 @@ public class TargetTreeWrapper_MenuBarTest { TargetTreeWrapper_MenuBar wrapper; - // private TargetTestNode targetNodeB; - // private TargetTestNode targetNodeC; - // private TargetTestNode targetNodeD; private TestCaptionReader captionReader; private MenuBar menuBar; private SourceTestNode sourceNodeA; private SourceTestNode sourceNodeB; - // private SourceTestNode sourceNodeC; - // private SourceTestNode sourceNodeD; private MenuItem targetNodeA; @Before @@ -39,12 +34,6 @@ public void setup() { menuBar = new MenuBar(); sourceNodeA = new SourceTestNode("sa"); sourceNodeB = new SourceTestNode("sb"); - // sourceNodeC = new SourceTestNode("sc"); - // sourceNodeD = new SourceTestNode("sd"); - // targetNodeA = new TargetTestNode("ta"); - // targetNodeB = new TargetTestNode("tb"); - // targetNodeC = new TargetTestNode("tc"); - // targetNodeD = new TargetTestNode("td"); } @Test(expected = NullPointerException.class) diff --git a/src/test/java/uk/q3c/util/TargetTreeWrapper_VaadinTreeTest.java b/src/test/java/uk/q3c/util/TargetTreeWrapper_VaadinTreeTest.java index 25ea40701..497791add 100644 --- a/src/test/java/uk/q3c/util/TargetTreeWrapper_VaadinTreeTest.java +++ b/src/test/java/uk/q3c/util/TargetTreeWrapper_VaadinTreeTest.java @@ -21,14 +21,10 @@ public class TargetTreeWrapper_VaadinTreeTest { - // private TargetTestNode targetNodeB; - // private TargetTestNode targetNodeC; - // private TargetTestNode targetNodeD; private TestCaptionReader captionReader; private SourceTestNode sourceNodeA; private SourceTestNode sourceNodeB; private SourceTestNode sourceNodeC; - // private SourceTestNode sourceNodeD; private TargetTestNode targetNodeA; private Tree tree; private TargetTreeWrapper_VaadinTree wrapper; @@ -39,11 +35,7 @@ public void setup() { sourceNodeA = new SourceTestNode("sa"); sourceNodeB = new SourceTestNode("sb"); sourceNodeC = new SourceTestNode("sc"); - // sourceNodeD = new SourceTestNode("sd"); targetNodeA = new TargetTestNode("ta"); - // targetNodeB = new TargetTestNode("tb"); - // targetNodeC = new TargetTestNode("tc"); - // targetNodeD = new TargetTestNode("td"); } @Test(expected = NullPointerException.class)