Repository: incubator-rya Updated Branches: refs/heads/master 63f87b868 -> 28b0a52d0
RYA-361 Removed dialogs and jcalendar. closes #224 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/3aae3258 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/3aae3258 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/3aae3258 Branch: refs/heads/master Commit: 3aae3258db901706e9aa25739d53b5c2825cfd9b Parents: 63f87b8 Author: David Lotts <david.lo...@parsons.com> Authored: Thu Sep 7 17:23:52 2017 -0400 Committer: David Lotts <david.lo...@parsons.com> Committed: Fri Sep 8 14:46:14 2017 -0400 ---------------------------------------------------------------------- extras/rya.export/export.client/pom.xml | 6 - .../client/conf/DateTimePickerDialog.java | 172 ------------------- .../client/conf/MergeConfigurationCLI.java | 15 +- extras/rya.merger/pom.xml | 5 - .../apache/rya/accumulo/mr/merge/CopyTool.java | 20 +-- .../apache/rya/accumulo/mr/merge/MergeTool.java | 41 +---- .../mr/merge/gui/DateTimePickerDialog.java | 172 ------------------- .../rya/accumulo/mr/merge/CopyToolTest.java | 3 +- .../rya/accumulo/mr/merge/MergeToolTest.java | 3 +- .../accumulo/mr/merge/demo/CopyToolDemo.java | 3 +- .../accumulo/mr/merge/demo/MergeToolDemo.java | 3 +- 11 files changed, 21 insertions(+), 422 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.export/export.client/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.client/pom.xml b/extras/rya.export/export.client/pom.xml index 2ea0a30..eb9c554 100644 --- a/extras/rya.export/export.client/pom.xml +++ b/extras/rya.export/export.client/pom.xml @@ -59,12 +59,6 @@ under the License. </dependency> <dependency> - <groupId>com.toedter</groupId> - <artifactId>jcalendar</artifactId> - <version>1.1.4</version> - </dependency> - - <dependency> <groupId>org.openrdf.sesame</groupId> <artifactId>sesame-queryrender</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/DateTimePickerDialog.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/DateTimePickerDialog.java b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/DateTimePickerDialog.java deleted file mode 100644 index eaa8822..0000000 --- a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/DateTimePickerDialog.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.rya.export.client.conf; - -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.Calendar; -import java.util.Date; - -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JSpinner; -import javax.swing.JSpinner.DateEditor; -import javax.swing.SpinnerDateModel; -import javax.swing.SpinnerModel; -import javax.swing.WindowConstants; - -import com.toedter.calendar.JCalendar; - -/** - * Dialog for picking date and time. - */ -public class DateTimePickerDialog extends JDialog { - private static final long serialVersionUID = 1L; - - private JCalendar dateChooser; - private JSpinner timeSpinner; - - private Date selectedDateTime; - private final JLabel label; - - - /** - * Creates a new instance of {@link DateTimePickerDialog}. - * @param title the title to display up top. - * @param message the message to display. - */ - public DateTimePickerDialog(final String title, final String message) { - this(null, title, message); - } - - /** - * Creates a new instance of {@link DateTimePickerDialog}. - * @param date the initial date to have the dialog show. - * @param title the title to display up top. - * @param message the message to display. - */ - public DateTimePickerDialog(final Date date, final String title, final String message) { - // Create a modal dialog - super((JDialog) null); - setTitle(title); - setModalityType(ModalityType.APPLICATION_MODAL); - setType(Type.NORMAL); - - setLayout(new GridBagLayout()); - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - - final JButton okButton = new JButton("OK"); - okButton.addActionListener (new ActionListener() { - @Override - public void actionPerformed(final ActionEvent event) { - selectedDateTime = findSelectedDateTime(); - - // Hide dialog - setVisible(false); - } - }); - - getRootPane().setDefaultButton(okButton); - - final JPanel dateTimePanel = buildDateTimePanel(date); - label = new JLabel (message); - label.setBorder(BorderFactory.createEtchedBorder()); - - final GridBagConstraints c = new GridBagConstraints(); - c.fill = GridBagConstraints.HORIZONTAL; - c.insets = new Insets(5, 5, 5, 5); - c.gridx = 0; - c.gridy = 0; - - add(dateTimePanel, c); - c.gridy++; - add(label, c); - c.anchor = GridBagConstraints.EAST; - c.fill = GridBagConstraints.NONE; - c.gridy++; - add(okButton, c); - - pack(); - } - - private JPanel buildDateTimePanel(final Date date) { - final JPanel datePanel = new JPanel(); - - dateChooser = new JCalendar(); - if (date != null) { - final Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - dateChooser.setCalendar(calendar); - } - - datePanel.add(dateChooser); - - final SpinnerModel model = new SpinnerDateModel(); - timeSpinner = new JSpinner(model); - final DateEditor editor = new DateEditor(timeSpinner, "HH:mm:ss"); - timeSpinner.setEditor(editor); - if (date != null) { - timeSpinner.setValue(date); - } - - datePanel.add(timeSpinner); - - return datePanel; - } - - private Date findSelectedDateTime() { - // Get the values from the date chooser - final int day = dateChooser.getDayChooser().getDay(); - final int month = dateChooser.getMonthChooser().getMonth(); - final int year = dateChooser.getYearChooser().getYear(); - - // Get the values from the time chooser - final Calendar timeCalendar = Calendar.getInstance(); - timeCalendar.setTime((Date) timeSpinner.getValue()); - final int hour = timeCalendar.get(Calendar.HOUR_OF_DAY); - final int minute = timeCalendar.get(Calendar.MINUTE); - final int second = timeCalendar.get(Calendar.SECOND); - - // Combine these values into a single date object - final Calendar newCalendar = Calendar.getInstance(); - newCalendar.set(Calendar.YEAR, year); - newCalendar.set(Calendar.MONTH, month); - newCalendar.set(Calendar.DATE, day); - newCalendar.set(Calendar.HOUR_OF_DAY, hour); - newCalendar.set(Calendar.MINUTE, minute); - newCalendar.set(Calendar.SECOND, second); - - final Date newDate = newCalendar.getTime(); - - return newDate; - } - - /** - * @return the selected date time. - */ - public Date getSelectedDateTime() { - return selectedDateTime; - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigurationCLI.java ---------------------------------------------------------------------- diff --git a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigurationCLI.java b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigurationCLI.java index f0c5136..b8a64d9 100644 --- a/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigurationCLI.java +++ b/extras/rya.export/export.client/src/main/java/org/apache/rya/export/client/conf/MergeConfigurationCLI.java @@ -54,10 +54,6 @@ import com.google.common.annotations.VisibleForTesting; * Helper class for processing command line arguments for the Merge Tool. */ public class MergeConfigurationCLI { - private static final String DIALOG_TITLE = "Select a Start Time/Date"; - private static final String DIALOG_MESSAGE = - "<html>Choose the time of the data to merge.<br>Only data modified AFTER the selected time will be merged.</html>"; - private static final Option CONFIG_OPTION = new Option("c", true, "Defines the configuration file for the Merge Tool to use."); private static final Option TIME_OPTION = new Option("t", true, "Defines the timestamp from which to filter RyaStatements when merging."); private static final Option PARENT_HOST_OPTION = new Option("a", "pHost", true, "Defines the hostname of the parent db to connect to."); @@ -149,7 +145,12 @@ public class MergeConfigurationCLI { throw new MergeConfigurationException("Failed to create a config based on the provided configuration.", JAXBe); } } - + /** + * Gets and parses the time from the configuration or command line. + * This is for API and is not used internally as of v3.2.11 + * @return a time or throws an exception when no time is configured because time is required. + * @throws MergeConfigurationException when date is badly formated or missing. + */ public Date getRyaStatementMergeTime() throws MergeConfigurationException { final Date time; if(cmd.hasOption(TIME_OPTION.getOpt())) { @@ -160,9 +161,7 @@ public class MergeConfigurationCLI { throw new MergeConfigurationException("The provided timestamp was not formatted correctly.", e); } } else { - final DateTimePickerDialog dialog = new DateTimePickerDialog(DIALOG_TITLE, DIALOG_MESSAGE); - dialog.setVisible(true); - time = dialog.getSelectedDateTime(); + throw new MergeConfigurationException("The "+TIME_OPTION.getArgName()+" option was not specified. "+TIME_OPTION.getDescription()); } return time; } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.merger/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml index 44f65ef..206c8f9 100644 --- a/extras/rya.merger/pom.xml +++ b/extras/rya.merger/pom.xml @@ -49,11 +49,6 @@ under the License. <artifactId>plexus-utils</artifactId> </dependency> <dependency> - <groupId>com.toedter</groupId> - <artifactId>jcalendar</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.8.2</version> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java index 660fa19..4597400 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/CopyTool.java @@ -88,7 +88,6 @@ import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.mr.AccumuloHDFSFileInputFormat; import org.apache.rya.accumulo.mr.MRUtils; import org.apache.rya.accumulo.mr.merge.common.InstanceType; -import org.apache.rya.accumulo.mr.merge.gui.DateTimePickerDialog; import org.apache.rya.accumulo.mr.merge.mappers.AccumuloCopyToolMapper; import org.apache.rya.accumulo.mr.merge.mappers.AccumuloRyaRuleMapper; import org.apache.rya.accumulo.mr.merge.mappers.FileCopyToolMapper; @@ -207,10 +206,9 @@ public class CopyTool extends AbstractDualInstanceAccumuloMRTool { */ public static final String QUERY_FILE_PROP = "ac.copy.queryfile"; - private static final String DIALOG_TITLE = "Select a Start Time/Date"; - private static final String DIALOG_MESSAGE = - "<html>Choose the time of the data to copy.<br>Only parent data AFTER the selected time will be copied to the child.</html>"; - + /** + * startTime is the time of the data to copy. Only parent data AFTER the selected time will be copied to the child. + */ private String startTime = null; private boolean useCopyFileOutput = false; private String baseOutputDir = null; @@ -250,17 +248,7 @@ public class CopyTool extends AbstractDualInstanceAccumuloMRTool { startTime = conf.get(MergeTool.START_TIME_PROP, null); if (!useCopyFileImport) { - // Display start time dialog if requested - if (MergeTool.USE_START_TIME_DIALOG.equals(startTime)) { - log.info("Select start time from dialog..."); - final DateTimePickerDialog dateTimePickerDialog = new DateTimePickerDialog(DIALOG_TITLE, DIALOG_MESSAGE); - dateTimePickerDialog.setVisible(true); - - final Date date = dateTimePickerDialog.getSelectedDateTime(); - startTime = MergeTool.START_TIME_FORMATTER.format(date); - conf.set(MergeTool.START_TIME_PROP, startTime); - log.info("Will copy all data after " + date); - } else if (startTime != null) { + if (startTime != null) { try { final Date date = MergeTool.START_TIME_FORMATTER.parse(startTime); log.info("Will copy all data after " + date); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java index d031d20..21a8316 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java @@ -65,7 +65,6 @@ import com.google.common.collect.ImmutableMap; import org.apache.rya.accumulo.AccumuloRdfConfiguration; import org.apache.rya.accumulo.mr.AccumuloHDFSFileInputFormat; import org.apache.rya.accumulo.mr.MRUtils; -import org.apache.rya.accumulo.mr.merge.gui.DateTimePickerDialog; import org.apache.rya.accumulo.mr.merge.mappers.MergeToolMapper; import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; import org.apache.rya.accumulo.mr.merge.util.TimeUtils; @@ -115,16 +114,7 @@ public class MergeTool extends AbstractDualInstanceAccumuloMRTool { */ public static final String MERGE_FILE_INPUT_PATH = "merge.file.input.path"; - /** - * A value used for the {@link #START_TIME_PROP} property to indicate that a dialog - * should be displayed to select the time. - */ - public static final String USE_START_TIME_DIALOG = "dialog"; - - private static final String DIALOG_TITLE = "Select a Start Time/Date"; - private static final String DIALOG_MESSAGE = - "<html>Choose the time of the data to merge.<br>Only data modified AFTER the selected time will be merged.</html>"; - + // startTime is the time of the data to merge. Only data modified AFTER the selected time will be merged. private String startTime = null; private String tempDir = null; private boolean useMergeFileInput = false; @@ -208,18 +198,7 @@ public class MergeTool extends AbstractDualInstanceAccumuloMRTool { startTime = conf.get(START_TIME_PROP, null); if (!useMergeFileInput) { - // Display start time dialog if requested - if (USE_START_TIME_DIALOG.equals(startTime)) { - log.info("Select start time from dialog..."); - - final DateTimePickerDialog dateTimePickerDialog = new DateTimePickerDialog(DIALOG_TITLE, DIALOG_MESSAGE); - dateTimePickerDialog.setVisible(true); - - final Date date = dateTimePickerDialog.getSelectedDateTime(); - startTime = START_TIME_FORMATTER.format(date); - conf.set(START_TIME_PROP, startTime); - log.info("Will merge all data after " + date); - } else if (startTime != null) { + if (startTime != null) { try { final Date date = START_TIME_FORMATTER.parse(startTime); log.info("Will merge all data after " + date); @@ -510,20 +489,12 @@ public class MergeTool extends AbstractDualInstanceAccumuloMRTool { } /** - * Creates a formatted string for the start time based on the specified date and whether the dialog is to be displayed. + * Creates a formatted string for the start time based on the specified date. * @param startDate the start {@link Date} to format. - * @param isStartTimeDialogEnabled {@code true} to display the time dialog instead of using the date. {@code false} - * to use the provided {@code startDate}. - * @return the formatted start time string or {@code "dialog"}. + * @return the formatted start time string. */ - public static String getStartTimeString(final Date startDate, final boolean isStartTimeDialogEnabled) { - String startTimeString; - if (isStartTimeDialogEnabled) { - startTimeString = USE_START_TIME_DIALOG; // set start date from dialog box - } else { - startTimeString = convertDateToStartTimeString(startDate); - } - return startTimeString; + public static String getStartTimeString(final Date startDate) { + return convertDateToStartTimeString(startDate); } /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/gui/DateTimePickerDialog.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/gui/DateTimePickerDialog.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/gui/DateTimePickerDialog.java deleted file mode 100644 index 1c12bee..0000000 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/gui/DateTimePickerDialog.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.rya.accumulo.mr.merge.gui; - -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.Calendar; -import java.util.Date; - -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JSpinner; -import javax.swing.JSpinner.DateEditor; -import javax.swing.SpinnerDateModel; -import javax.swing.SpinnerModel; -import javax.swing.WindowConstants; - -import com.toedter.calendar.JCalendar; - -/** - * Dialog for picking date and time. - */ -public class DateTimePickerDialog extends JDialog { - private static final long serialVersionUID = 1L; - - private JCalendar dateChooser; - private JSpinner timeSpinner; - - private Date selectedDateTime; - private final JLabel label; - - - /** - * Creates a new instance of {@link DateTimePickerDialog}. - * @param title the title to display up top. - * @param message the message to display. - */ - public DateTimePickerDialog(final String title, final String message) { - this(null, title, message); - } - - /** - * Creates a new instance of {@link DateTimePickerDialog}. - * @param date the initial date to have the dialog show. - * @param title the title to display up top. - * @param message the message to display. - */ - public DateTimePickerDialog(final Date date, final String title, final String message) { - // Create a modal dialog - super((JDialog) null); - setTitle(title); - setModalityType(ModalityType.APPLICATION_MODAL); - setType(Type.NORMAL); - - setLayout(new GridBagLayout()); - setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); - - final JButton okButton = new JButton("OK"); - okButton.addActionListener (new ActionListener() { - @Override - public void actionPerformed(final ActionEvent event) { - selectedDateTime = findSelectedDateTime(); - - // Hide dialog - setVisible(false); - } - }); - - getRootPane().setDefaultButton(okButton); - - final JPanel dateTimePanel = buildDateTimePanel(date); - label = new JLabel (message); - label.setBorder(BorderFactory.createEtchedBorder()); - - final GridBagConstraints c = new GridBagConstraints(); - c.fill = GridBagConstraints.HORIZONTAL; - c.insets = new Insets(5, 5, 5, 5); - c.gridx = 0; - c.gridy = 0; - - add(dateTimePanel, c); - c.gridy++; - add(label, c); - c.anchor = GridBagConstraints.EAST; - c.fill = GridBagConstraints.NONE; - c.gridy++; - add(okButton, c); - - pack(); - } - - private JPanel buildDateTimePanel(final Date date) { - final JPanel datePanel = new JPanel(); - - dateChooser = new JCalendar(); - if (date != null) { - final Calendar calendar = Calendar.getInstance(); - calendar.setTime(date); - dateChooser.setCalendar(calendar); - } - - datePanel.add(dateChooser); - - final SpinnerModel model = new SpinnerDateModel(); - timeSpinner = new JSpinner(model); - final DateEditor editor = new DateEditor(timeSpinner, "HH:mm:ss"); - timeSpinner.setEditor(editor); - if (date != null) { - timeSpinner.setValue(date); - } - - datePanel.add(timeSpinner); - - return datePanel; - } - - private Date findSelectedDateTime() { - // Get the values from the date chooser - final int day = dateChooser.getDayChooser().getDay(); - final int month = dateChooser.getMonthChooser().getMonth(); - final int year = dateChooser.getYearChooser().getYear(); - - // Get the values from the time chooser - final Calendar timeCalendar = Calendar.getInstance(); - timeCalendar.setTime((Date) timeSpinner.getValue()); - final int hour = timeCalendar.get(Calendar.HOUR_OF_DAY); - final int minute = timeCalendar.get(Calendar.MINUTE); - final int second = timeCalendar.get(Calendar.SECOND); - - // Combine these values into a single date object - final Calendar newCalendar = Calendar.getInstance(); - newCalendar.set(Calendar.YEAR, year); - newCalendar.set(Calendar.MONTH, month); - newCalendar.set(Calendar.DATE, day); - newCalendar.set(Calendar.HOUR_OF_DAY, hour); - newCalendar.set(Calendar.MINUTE, minute); - newCalendar.set(Calendar.SECOND, second); - - final Date newDate = newCalendar.getTime(); - - return newDate; - } - - /** - * @return the selected date time. - */ - public Date getSelectedDateTime() { - return selectedDateTime; - } -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java index c4dae61..59f75a5 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java @@ -73,7 +73,6 @@ public class CopyToolTest { private static final boolean IS_MOCK = true; private static final boolean USE_TIME_SYNC = false; private static final boolean USE_COPY_FILE_OUTPUT = false; - private static final boolean IS_START_TIME_DIALOG_ENABLED = false; private static final String CHILD_SUFFIX = MergeTool.CHILD_SUFFIX; @@ -167,7 +166,7 @@ public class CopyToolTest { makeArgument(CopyTool.USE_COPY_FILE_OUTPUT_DIRECTORY_CLEAR, Boolean.toString(true)), makeArgument(CopyTool.COPY_FILE_IMPORT_DIRECTORY, "resources/test/copy_tool_file_output/"), makeArgument(CopyTool.USE_COPY_FILE_IMPORT, Boolean.toString(isImporting)), - makeArgument(MergeTool.START_TIME_PROP, MergeTool.getStartTimeString(startDate, IS_START_TIME_DIALOG_ENABLED)) + makeArgument(MergeTool.START_TIME_PROP, MergeTool.getStartTimeString(startDate)) }); final Configuration toolConfig = copyTool.getConf(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java index 7c89466..54e5b44 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java @@ -68,7 +68,6 @@ public class MergeToolTest { private static final boolean IS_MOCK = true; private static final boolean USE_TIME_SYNC = false; - private static final boolean IS_START_TIME_DIALOG_ENABLED = false; private static final String CHILD_SUFFIX = MergeTool.CHILD_SUFFIX; @@ -157,7 +156,7 @@ public class MergeToolTest { makeArgument(CopyTool.CHILD_TOMCAT_URL_PROP, CHILD_TOMCAT_URL), makeArgument(CopyTool.NTP_SERVER_HOST_PROP, TimeUtils.DEFAULT_TIME_SERVER_HOST), makeArgument(CopyTool.USE_NTP_SERVER_PROP, Boolean.toString(USE_TIME_SYNC)), - makeArgument(MergeTool.START_TIME_PROP, MergeTool.getStartTimeString(startDate, IS_START_TIME_DIALOG_ENABLED)) + makeArgument(MergeTool.START_TIME_PROP, MergeTool.getStartTimeString(startDate)) }); log.info("Finished running tool."); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java index e789c5f..6ac8d30 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java @@ -71,7 +71,6 @@ public class CopyToolDemo { private static final boolean USE_COPY_FILE_OUTPUT = false; private static final boolean USE_COPY_FILE_IMPORT = false; private static final boolean IS_PROMPTING_ENABLED = true; - private static final boolean IS_START_TIME_DIALOG_ENABLED = true; private static final LoggingDetail LOGGING_DETAIL = LoggingDetail.LIGHT; private static final String CHILD_SUFFIX = MergeTool.CHILD_SUFFIX; @@ -190,7 +189,7 @@ public class CopyToolDemo { makeArgument(CopyTool.COPY_FILE_IMPORT_DIRECTORY, "resources/test/copy_tool_file_output/"), makeArgument(CopyTool.USE_COPY_FILE_IMPORT, Boolean.toString(USE_COPY_FILE_IMPORT)), //makeArgument(CopyTool.COPY_TABLE_LIST_PROP, Joiner.on(",").join(accumuloDualInstanceDriver.getParentTableList())), - makeArgument(MergeTool.START_TIME_PROP, MergeTool.getStartTimeString(startDate, IS_START_TIME_DIALOG_ENABLED)) + makeArgument(MergeTool.START_TIME_PROP, MergeTool.getStartTimeString(startDate)) }); final Configuration toolConfig = copyTool.getConf(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/3aae3258/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java index c4cbdb9..6cc59f0 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java @@ -56,7 +56,6 @@ public class MergeToolDemo { private static final boolean USE_TIME_SYNC = false; private static final boolean USE_MERGE_FILE_INPUT = false; private static final boolean IS_PROMPTING_ENABLED = true; - private static final boolean IS_START_TIME_DIALOG_ENABLED = true; private static final LoggingDetail LOGGING_DETAIL = LoggingDetail.LIGHT; private static final String CHILD_SUFFIX = MergeTool.CHILD_SUFFIX; @@ -174,7 +173,7 @@ public class MergeToolDemo { makeArgument(CopyTool.USE_NTP_SERVER_PROP, Boolean.toString(USE_TIME_SYNC)), makeArgument(MergeTool.USE_MERGE_FILE_INPUT, Boolean.toString(USE_MERGE_FILE_INPUT)), makeArgument(MergeTool.MERGE_FILE_INPUT_PATH, "resources/test/merge_tool_file_input/"), - makeArgument(MergeTool.START_TIME_PROP, MergeTool.getStartTimeString(startDate, IS_START_TIME_DIALOG_ENABLED)) + makeArgument(MergeTool.START_TIME_PROP, MergeTool.getStartTimeString(startDate)) }); log.info("Finished running tool.");
