conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import org.junit.After;
=======
import org.apache.streams.util.ComponentUtils;
import org.junit.After;
>>>>>>>
import org.apache.streams.util.ComponentUtils;
import org.junit.After;
<<<<<<<
private static final String MBEAN_ID = "test_bean";
/**
* Remove registered mbeans from previous tests
* @throws Exception
*/
@After
public void unregisterMXBean() throws Exception {
try {
ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName(String.format(StreamsTaskCounter.NAME_TEMPLATE, MBEAN_ID)));
} catch (InstanceNotFoundException ife) {
//No-op
}
}
=======
@After
public void removeLocalMBeans() {
try {
ComponentUtils.removeAllMBeansOfDomain("org.apache.streams.local");
} catch (Exception e) {
//No op. proceed to next test
}
}
>>>>>>>
private static final String MBEAN_ID = "test_bean";
@After
public void removeLocalMBeans() {
try {
ComponentUtils.removeAllMBeansOfDomain("org.apache.streams.local");
} catch (Exception e) {
//No op. proceed to next test
}
} |
<<<<<<<
protected final Daten daten;
// private final SpacerIcon spacerIcon = new SpacerIcon(30);
/* private final JSpinner jSpinnerAnzahl = new JSpinner(new SpinnerNumberModel(1, 1, 9, 1));
=======
private static final String TEXT_LINE = "==========================================";
private static final String LOG_TEXT_STARTPARAMETER_PATTERN = "Startparameter: %s";
private static final String ICON_NAME = "MediathekView.png";
private static final String ICON_PATH = "/mediathek/res/";
private static final int ICON_WIDTH = 58;
private static final int ICON_HEIGHT = 58;
private static final String KEY_F10 = "F10";
private static final String NONE = "none";
private static final String LOG_TEXT_PROGRAMMSTART = "***Programmstart***";
private static final String SPLASHSCREEN_TEXT_ANWENDUNGSDATEN_LADEN = "Anwendungsdaten laden...";
private static final String LOG_TEXT_START = "Start";
private static final String SPLASHSCREEN_TEXT_GUI_INITIALISIEREN = "GUI Initialisieren...";
private static final String LOG_TEXT_ERSTER_START = "Erster Start";
private static final String LOG_TEXT_START_GUI = "Start Gui";
private static final String LOG_TEXT_INIT_GUI = "Init GUI";
private static final String ACTION_KEY_MAC_F = "mac-f";
private static final String LOG_TEXT_GUI_STEHT = "Gui steht!";
private static final String ARGUMENT_PREFIX = "-";
private static final String TITLE_TEXT_PROGRAMMVERSION_IST_AKTUELL = "Programmversion ist aktuell";
private static final String TITLE_TEXT_EIN_PROGRAMMUPDATE_IST_VERFUEGBAR = "Ein Programmupdate ist verfügbar";
private static final String LOG_TEXT_CHECK_UPDATE = "CheckUpdate";
private static final String TABNAME_FILME = "Filme";
private static final String TABNAME_DEBUG = "Debug";
private static final String TABNAME_DOWNLOADS = "Downloads";
private static final String TABNAME_ABOS = "Abos";
private static final String TABNAME_MELDUNGEN = "Meldungen";
private static final String LOG_TEXT_DIE_DOWNLOADS_MUESSEN_ZUERST_GESTARTET_WERDEN = "Die Downloads müssen zuerst gestartet werden.";
private static final String LOG_TEXT_KEINE_LAUFENDEN_DOWNLOADS = "Keine laufenden Downloads!";
private static final String DIALOG_TITLE_BLACKLIST = "Blacklist";
private static final String PANEL_BLACKLIST_NAME_POSTFIX = "_2";
private static final String CHECKBOX_TEXT_FILTER_ANZEIGEN = "Filter anzeigen";
private static final String CHECKBOX_TEXT_DOWNLOADS_IN_EXTRAFENSTER = "Downloads in Extrafenster";
private static final String CHECKBOX_TEXT_ABOS_IN_EXTRAFENSTER = "Abos in Extrafenster";
private static final String CHECKBOX_TEXT_MELDUNGEN_ANZEIGEN = "Meldungen anzeigen";
private static final String CHECKBOX_TEXT_IN_EXTRAFENSTER = "in Extrafenster";
private final Daten daten;
private final JSpinner jSpinnerAnzahl = new JSpinner(new SpinnerNumberModel(1, 1, 9, 1));
>>>>>>>
private static final String TEXT_LINE = "==========================================";
private static final String LOG_TEXT_STARTPARAMETER_PATTERN = "Startparameter: %s";
private static final String ICON_NAME = "MediathekView.png";
private static final String ICON_PATH = "/mediathek/res/";
private static final int ICON_WIDTH = 58;
private static final int ICON_HEIGHT = 58;
private static final String KEY_F10 = "F10";
private static final String NONE = "none";
private static final String LOG_TEXT_PROGRAMMSTART = "***Programmstart***";
private static final String SPLASHSCREEN_TEXT_ANWENDUNGSDATEN_LADEN = "Anwendungsdaten laden...";
private static final String LOG_TEXT_START = "Start";
private static final String SPLASHSCREEN_TEXT_GUI_INITIALISIEREN = "GUI Initialisieren...";
private static final String LOG_TEXT_ERSTER_START = "Erster Start";
private static final String LOG_TEXT_START_GUI = "Start Gui";
private static final String LOG_TEXT_INIT_GUI = "Init GUI";
private static final String ACTION_KEY_MAC_F = "mac-f";
private static final String LOG_TEXT_GUI_STEHT = "Gui steht!";
private static final String ARGUMENT_PREFIX = "-";
private static final String TITLE_TEXT_PROGRAMMVERSION_IST_AKTUELL = "Programmversion ist aktuell";
private static final String TITLE_TEXT_EIN_PROGRAMMUPDATE_IST_VERFUEGBAR = "Ein Programmupdate ist verfügbar";
private static final String LOG_TEXT_CHECK_UPDATE = "CheckUpdate";
private static final String TABNAME_FILME = "Filme";
private static final String TABNAME_DEBUG = "Debug";
private static final String TABNAME_DOWNLOADS = "Downloads";
private static final String TABNAME_ABOS = "Abos";
private static final String TABNAME_MELDUNGEN = "Meldungen";
private static final String LOG_TEXT_DIE_DOWNLOADS_MUESSEN_ZUERST_GESTARTET_WERDEN = "Die Downloads müssen zuerst gestartet werden.";
private static final String LOG_TEXT_KEINE_LAUFENDEN_DOWNLOADS = "Keine laufenden Downloads!";
private static final String DIALOG_TITLE_BLACKLIST = "Blacklist";
private static final String PANEL_BLACKLIST_NAME_POSTFIX = "_2";
private static final String CHECKBOX_TEXT_FILTER_ANZEIGEN = "Filter anzeigen";
private static final String CHECKBOX_TEXT_DOWNLOADS_IN_EXTRAFENSTER = "Downloads in Extrafenster";
private static final String CHECKBOX_TEXT_ABOS_IN_EXTRAFENSTER = "Abos in Extrafenster";
private static final String CHECKBOX_TEXT_MELDUNGEN_ANZEIGEN = "Meldungen anzeigen";
private static final String CHECKBOX_TEXT_IN_EXTRAFENSTER = "in Extrafenster";
private final Daten daten;
// private final SpacerIcon spacerIcon = new SpacerIcon(30);
/* private final JSpinner jSpinnerAnzahl = new JSpinner(new SpinnerNumberModel(1, 1, 9, 1));
<<<<<<<
private final JSlider jSliderBandbreite = new JSlider();*/
=======
private final JSlider jSliderBandbreite = new JSlider();
private final SplashScreenManager splashScreenManager;
>>>>>>>
private final JSlider jSliderBandbreite = new JSlider();*/
private final SplashScreenManager splashScreenManager;
<<<<<<<
private MVTray tray;
public enum TABS {
TAB_NIX, TAB_FILME, TAB_DOWNLOADS, TAB_ABOS, TAB_MELDUNGEN
}
/**
* Bandwidth monitoring for downloads.
*/
protected IBandwidthMonitor bandwidthMonitor;
=======
>>>>>>>
private MVTray tray;
<<<<<<<
/**
* The JVM {@link java.awt.SplashScreen} storage
*/
private SplashScreen splash;
/**
* Store the splash screen {@link Graphics2D} context here for reuse
*/
private Graphics2D splashScreenContext;
/**
* helper variable to calculate splash screen progress
*/
private int splashScreenProgress;
/**
* wegeb der möglichen Abfrage: "Backup laden.."
*/
public void closeSplashScreen() {
splashScreenContext = null;
=======
public void closeSplashScreen()
{
splashScreenManager.closeSplashScreen();
>>>>>>>
public void closeSplashScreen()
{
splashScreenManager.closeSplashScreen();
<<<<<<<
//Icons setzen
jMenuItemFilmlisteLaden.setIcon(Icons.ICON_MENUE_FILMLISTE_LADEN);
jMenuItemEinstellungen.setIcon(Icons.ICON_MENUE_EINSTELLUNGEN);
jMenuItemBeenden.setIcon(Icons.ICON_MENUE_BEENDEN);
jMenuItemFilmAbspielen.setIcon(Icons.ICON_MENUE_FILM_START);
jMenuItemFilmAufzeichnen.setIcon(Icons.ICON_MENUE_FILM_REC);
jMenuItemFilmeGesehen.setIcon(Icons.ICON_MENUE_HISTORY_ADD);
jMenuItemFilmeUngesehen.setIcon(Icons.ICON_MENUE_HISTORY_REMOVE);
jMenuItemBlacklist.setIcon(Icons.ICON_MENUE_BLACKLIST);
jMenuItemFilterLoeschen.setIcon(Icons.ICON_MENUE_CLEAR);
jMenuItemDownloadsAlleStarten.setIcon(Icons.ICON_MENUE_DOWNLOAD_ALLE_STARTEN);
jMenuItemDownloadStartTime.setIcon(Icons.ICON_MENUE_DOWNLOAD_ALLE_STARTEN);
jMenuItemDownloadAlleStoppen.setIcon(Icons.ICON_MENUE_DOWNOAD_STOP);
jMenuItemDownloadWartendeStoppen.setIcon(Icons.ICON_MENUE_DOWNOAD_STOP);
jMenuItemDownloadStarten.setIcon(Icons.ICON_MENUE_DOWNOAD_STARTEN);
jMenuItemDownloadStoppen.setIcon(Icons.ICON_MENUE_DOWNOAD_STOP);
jMenuItemDownloadVorziehen.setIcon(Icons.ICON_MENUE_VORZIEHEN);
jMenuItemDownloadsZurueckstellen.setIcon(Icons.ICON_MENUE_DOWNLOAD_ZURUECKSTELLEN);
jMenuItemDownloadsLoeschen.setIcon(Icons.ICON_MENUE_DOWNOAD_LOESCHEN);
jMenuItemDownloadAendern.setIcon(Icons.ICON_MENUE_DOWNLOAD_AENDERN);
jMenuItemDownloadsAktualisieren.setIcon(Icons.ICON_MENUE_AKTUALISIEREN);
jMenuItemDownloadAbspielen.setIcon(Icons.ICON_MENUE_FILM_START);
jMenuItemDownloadsAufraeumen.setIcon(Icons.ICON_MENUE_CLEAR);
jMenuItemDownloadShutDown.setIcon(Icons.ICON_MENUE_BEENDEN);
jMenuItemDownloadGesehen.setIcon(Icons.ICON_MENUE_HISTORY_ADD);
jMenuItemDownloadUngesehen.setIcon(Icons.ICON_MENUE_HISTORY_REMOVE);
jMenuItemAbosEinschalten.setIcon(Icons.ICON_MENUE_EIN);
jMenuItemAbosAusschalten.setIcon(Icons.ICON_MENUE_AUS);
jMenuItemAbosLoeschen.setIcon(Icons.ICON_MENUE_ABO_LOESCHEN);
jMenuItemAbosAendern.setIcon(Icons.ICON_MENUE_ABO_AENDERN);
jMenuItemAboNeu.setIcon(Icons.ICON_MENUE_ABO_NEU);
=======
setMenuIcons();
>>>>>>>
setMenuIcons();
<<<<<<<
// Hilfe
setupHelpMenu();
}
protected void setupHelpMenu() {
jMenuItemResetSettings.addActionListener(e -> {
ResetSettingsDialog dialog = new ResetSettingsDialog(this, daten);
GuiFunktionen.centerOnScreen(dialog, false);
dialog.setVisible(true);
=======
private void initializeAnsichtAbos()
{
//Ansicht Abos
jCheckBoxAboExtrafenster.setText(CHECKBOX_TEXT_ABOS_IN_EXTRAFENSTER);
jMenuAnsicht.add(jCheckBoxAboExtrafenster);
jCheckBoxAboExtrafenster.setSelected(Boolean.parseBoolean(MVConfig.get(MVConfig.Configs.SYSTEM_FENSTER_ABO)));
jCheckBoxAboExtrafenster.addActionListener(e -> {
MVConfig.add(MVConfig.Configs.SYSTEM_FENSTER_ABO, Boolean.toString(jCheckBoxAboExtrafenster.isSelected()));
initFrames();
});
}
private void initializeAnsichtDownloads()
{
jMenuAnsicht.add(new JSeparator());
jCheckBoxDownloadExtrafenster.setText(CHECKBOX_TEXT_DOWNLOADS_IN_EXTRAFENSTER);
jMenuAnsicht.add(jCheckBoxDownloadExtrafenster);
jCheckBoxDownloadExtrafenster.setSelected(Boolean.parseBoolean(MVConfig.get(MVConfig.Configs.SYSTEM_FENSTER_DOWNLOAD)));
jCheckBoxDownloadExtrafenster.addActionListener(e -> {
MVConfig.add(MVConfig.Configs.SYSTEM_FENSTER_DOWNLOAD, Boolean.toString(jCheckBoxDownloadExtrafenster.isSelected()));
initFrames();
>>>>>>>
protected void setupHelpMenu()
{
jMenuItemResetSettings.addActionListener(e ->
{
ResetSettingsDialog dialog = new ResetSettingsDialog(this, daten);
GuiFunktionen.centerOnScreen(dialog, false);
dialog.setVisible(true);
});
}
private void initializeAnsichtAbos()
{
//Ansicht Abos
jCheckBoxAboExtrafenster.setText(CHECKBOX_TEXT_ABOS_IN_EXTRAFENSTER);
jMenuAnsicht.add(jCheckBoxAboExtrafenster);
jCheckBoxAboExtrafenster.setSelected(Boolean.parseBoolean(MVConfig.get(MVConfig.Configs.SYSTEM_FENSTER_ABO)));
jCheckBoxAboExtrafenster.addActionListener(e -> {
MVConfig.add(MVConfig.Configs.SYSTEM_FENSTER_ABO, Boolean.toString(jCheckBoxAboExtrafenster.isSelected()));
initFrames(); |
<<<<<<<
ListeMediaDB tmp = new ListeMediaDB();
this.forEach(m -> {
=======
ListeMediaDB tmp = new ListeMediaDB(daten);
this.stream().forEach(m -> {
>>>>>>>
ListeMediaDB tmp = new ListeMediaDB(daten);
this.forEach(m -> {
<<<<<<<
Daten.listeMediaPath.stream()
.filter((mp) -> (!mp.savePath()))
.forEach((mp) -> searchFile(new File(mp.arr[DatenMediaPath.MEDIA_PATH_PATH]), false));
=======
daten.getListeMediaPath().stream().filter((mp) -> (!mp.savePath())).forEach((mp) -> {
searchFile(new File(mp.arr[DatenMediaPath.MEDIA_PATH_PATH]), false);
});
>>>>>>>
daten.getListeMediaPath().stream().filter((mp) -> (!mp.savePath())).forEach((mp) -> {
searchFile(new File(mp.arr[DatenMediaPath.MEDIA_PATH_PATH]), false);
}); |
<<<<<<<
private ArrayMap<BaseCell, ArrayMap<Method, Object>> methodMap = new ArrayMap<>(128);
private ArrayMap<Class, Method[]> methodCacheMap = new ArrayMap<>(128);
private ArrayMap<BaseCell, Method> postBindMap = new ArrayMap<>(128);
private ArrayMap<BaseCell, Method> postUnBindMap = new ArrayMap<>(128);
private ArrayMap<BaseCell, Method> cellInitedMap = new ArrayMap<>(128);
private ArrayMap<BaseCell, String> cellFlareIdMap = new ArrayMap<>(128);
=======
private ConcurrentHashMap<BaseCell, ConcurrentHashMap<Method, Object>> methodMap = new ConcurrentHashMap<>(128);
private ConcurrentHashMap<Class, Method[]> methodCacheMap = new ConcurrentHashMap<>(128);
private ConcurrentHashMap<BaseCell, Method> postBindMap = new ConcurrentHashMap<>(128);
private ConcurrentHashMap<BaseCell, Method> postUnBindMap = new ConcurrentHashMap<>(128);
private ConcurrentHashMap<BaseCell, Method> cellInitedMap = new ConcurrentHashMap<>(128);
>>>>>>>
private ConcurrentHashMap<BaseCell, ConcurrentHashMap<Method, Object>> methodMap = new ConcurrentHashMap<>(128);
private ConcurrentHashMap<Class, Method[]> methodCacheMap = new ConcurrentHashMap<>(128);
private ConcurrentHashMap<BaseCell, Method> postBindMap = new ConcurrentHashMap<>(128);
private ConcurrentHashMap<BaseCell, Method> postUnBindMap = new ConcurrentHashMap<>(128);
private ConcurrentHashMap<BaseCell, Method> cellInitedMap = new ConcurrentHashMap<>(128);
private ConcurrentHashMap<BaseCell, String> cellFlareIdMap = new ConcurrentHashMap<>(128); |
<<<<<<<
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(
EdDSANamedCurveTable.CURVE_ED25519_SHA512);
PrivateKey privKey = new EdDSAPrivateKey(new EdDSAPrivateKeySpec(
=======
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(Ed25519Verify.ED25519_CURVE_NAME);
privKey = new EdDSAPrivateKey(new EdDSAPrivateKeySpec(
>>>>>>>
EdDSAParameterSpec spec = EdDSANamedCurveTable.getByName(Ed25519Verify.ED25519_CURVE_NAME);
PrivateKey privKey = new EdDSAPrivateKey(new EdDSAPrivateKeySpec( |
<<<<<<<
void setState(@NonNull State state) {
=======
public void setState(@Nonnull State state) {
>>>>>>>
public void setState(@NonNull State state) {
<<<<<<<
@SuppressWarnings("WeakerAccess")
@NonNull
public JDA getJda() {
return lavalink.getJdaFromSnowflake(String.valueOf(guild));
}
private WebSocketClient getMainWs() {
return ((JDAImpl) getJda()).getClient();
}
=======
>>>>>>>
<<<<<<<
void setChannel(@NonNull VoiceChannel channel) {
this.channel = channel.getId();
=======
public void setChannel(@Nonnull String channel) {
this.channel = channel;
>>>>>>>
public void setChannel(@NonNull String channel) {
this.channel = channel; |
<<<<<<<
import edu.umd.cs.findbugs.annotations.NonNull;
import lavalink.client.LavalinkUtil;
import net.dv8tion.jda.core.JDA;
import net.dv8tion.jda.core.entities.Guild;
import net.dv8tion.jda.core.entities.impl.JDAImpl;
import net.dv8tion.jda.core.events.ReadyEvent;
import net.dv8tion.jda.core.events.ReconnectedEvent;
import net.dv8tion.jda.core.events.channel.voice.VoiceChannelDeleteEvent;
import net.dv8tion.jda.core.events.guild.GuildLeaveEvent;
import net.dv8tion.jda.core.handle.SocketHandler;
import net.dv8tion.jda.core.hooks.ListenerAdapter;
=======
>>>>>>>
import edu.umd.cs.findbugs.annotations.NonNull;
<<<<<<<
public void addNode(@NonNull String name, @NonNull URI serverUri, @NonNull String password) {
=======
@SuppressWarnings("WeakerAccess")
public void addNode(@Nonnull String name, @Nonnull URI serverUri, @Nonnull String password) {
>>>>>>>
@SuppressWarnings("WeakerAccess")
public void addNode(@NonNull String name, @NonNull URI serverUri, @NonNull String password) {
<<<<<<<
@NonNull
public Collection<Link> getLinks() {
=======
@Nonnull
public Collection<T> getLinks() {
>>>>>>>
@NonNull
public Collection<T> getLinks() {
<<<<<<<
@SuppressWarnings("WeakerAccess")
@NonNull
public JDA getJda(int shardId) {
return jdaProvider.apply(shardId);
}
@SuppressWarnings("WeakerAccess")
@NonNull
public JDA getJdaFromSnowflake(String snowflake) {
return jdaProvider.apply(LavalinkUtil.getShardFromSnowflake(snowflake, numShards));
}
=======
>>>>>>> |
<<<<<<<
import org.syncany.config.to.DaemonConfigTO.FolderTO;
import org.syncany.operations.daemon.messages.BadRequestResponse;
import org.syncany.operations.daemon.messages.WatchRequest;
=======
import org.syncany.config.to.FolderTO;
>>>>>>>
import org.syncany.config.to.FolderTO;
import org.syncany.operations.daemon.messages.BadRequestResponse;
import org.syncany.operations.daemon.messages.WatchRequest;
<<<<<<<
=======
import org.syncany.operations.watch.WatchOperationListener;
import org.syncany.operations.watch.WatchOperationOptions;
>>>>>>>
import org.syncany.operations.watch.WatchOperationOptions;
<<<<<<<
WatchOperationThread watchOperationThread = new WatchOperationThread(localDir);
=======
WatchOperationThread watchOperationThread = new WatchOperationThread(localDir, watchOperationOptions, this);
>>>>>>>
WatchOperationThread watchOperationThread = new WatchOperationThread(localDir, watchOperationOptions); |
<<<<<<<
OptionSpec<Void> optionNoDaemon = parser.acceptsAll(asList("N", "no-daemon"));
=======
OptionSpec<Void> optionNonInteractive = parser.acceptsAll(asList("I", "no-interaction"));
OptionSpec<Void> optionAddDaemon = parser.acceptsAll(asList("n", "add-daemon"));
>>>>>>>
OptionSpec<Void> optionAddDaemon = parser.acceptsAll(asList("n", "add-daemon"));
<<<<<<<
operationOptions.setDaemon(!options.has(optionNoDaemon));
=======
operationOptions.setDaemon(options.has(optionAddDaemon));
>>>>>>>
operationOptions.setDaemon(options.has(optionAddDaemon)); |
<<<<<<<
private Config config;
private PluginListener listener;
private File repositoryPath;
=======
protected File repositoryPath;
>>>>>>>
protected Config config;
protected PluginListener listener;
protected File repositoryPath; |
<<<<<<<
=======
import org.syncany.cli.util.InitConsole;
>>>>>>>
import org.syncany.cli.util.InitConsole; |
<<<<<<<
* Copyright (C) 2011-2014 Philipp C. Heckel <[email protected]>
=======
* Copyright (C) 2011-2015 Philipp C. Heckel <[email protected]>
>>>>>>>
* Copyright (C) 2011-2015 Philipp C. Heckel <[email protected]>
<<<<<<<
import org.syncany.operations.daemon.messages.api.JsonMessageFactory;
=======
import org.syncany.operations.daemon.messages.api.EventResponse;
import org.syncany.operations.daemon.messages.api.Message;
import org.syncany.operations.daemon.messages.api.MessageFactory;
>>>>>>>
import org.syncany.operations.daemon.messages.api.JsonMessageFactory;
import org.syncany.operations.daemon.messages.api.EventResponse;
import org.syncany.operations.daemon.messages.api.Message;
<<<<<<<
Request request;
switch (requestFormatType) {
case JSON:
request = JsonMessageFactory.toRequest(message);
break;
case XML:
request = XmlMessageFactory.toRequest(message);
break;
default:
throw new Exception("Unknown request format. Valid formats are " + Joiner.on(", ").join(WebServer.RequestFormatType.values()));
}
daemonWebServer.putRequestFormatType(request.getId(), requestFormatType);
daemonWebServer.putCacheWebSocketRequest(request.getId(), clientSocket);
eventBus.post(request);
=======
Message message = MessageFactory.toMessage(messageStr);
if (message instanceof Request) {
handleRequest(clientSocket, (Request) message);
}
else if (message instanceof EventResponse) {
handleEventResponse(clientSocket, (EventResponse) message);
}
else {
throw new Exception("Invalid message type received: " + message.getClass());
}
>>>>>>>
Message message;
switch (requestFormatType) {
case JSON:
message = JsonMessageFactory.toRequest(messageStr);
break;
case XML:
message = XmlMessageFactory.toRequest(messageStr);
break;
default:
throw new Exception("Unknown request format. Valid formats are " + Joiner.on(", ").join(WebServer.RequestFormatType.values()));
}
if (message instanceof Request) {
handleRequest(clientSocket, (Request) message);
}
else if (message instanceof EventResponse) {
handleEventResponse(clientSocket, (EventResponse) message);
}
else {
throw new Exception("Invalid message type received: " + message.getClass());
} |
<<<<<<<
private Request createRestRequest(Command command, String commandName) throws Exception {
if (command.getRequiredCommandScope() == CommandScope.INITIALIZED_LOCALDIR) {
return buildFolderRequestFromCommand(command, commandName, config.getLocalDir().getAbsolutePath());
}
else {
return buildManagementRequestFromCommand(command, commandName);
}
}
private int handleRestResponse(Command command, HttpResponse httpResponse) throws Exception {
logger.log(Level.FINE, "Received HttpResponse: " + httpResponse);
String responseStr = IOUtils.toString(httpResponse.getEntity().getContent());
logger.log(Level.FINE, "Responding to message with responseString: " + responseStr);
Response response = MessageFactory.createResponse(responseStr);
if (response instanceof FolderResponse) {
FolderResponse folderResponse = (FolderResponse) response;
command.printResults(folderResponse.getResult());
return 0;
}
else if (response instanceof AlreadySyncingResponse) {
out.println("Daemon is already syncing, please retry later.");
return 1;
}
else if (response instanceof BadRequestResponse) {
out.println("Invalid Request : " + response.getMessage());
return 1;
}
return 1;
}
private Request buildManagementRequestFromCommand(Command command, String commandName) throws Exception {
String thisPackage = "org.syncany.operations.daemon.messages";
String camelCaseMessageType = StringUtil.toCamelCase(commandName) + "ManagementRequest";
String fqMessageClassName = thisPackage + "." + camelCaseMessageType;
// Try to load!
try {
Class<? extends FolderRequest> message = Class.forName(fqMessageClassName).asSubclass(FolderRequest.class);
FolderRequest request = message.newInstance();
request.setId(new Random().nextInt());
request.setOptions(command.parseOptions(args));
return request;
}
catch (Exception e) {
logger.log(Level.INFO, "Could not find FQCN " + fqMessageClassName, e);
throw new Exception("Cannot read request class from request type: " + commandName, e);
}
}
=======
>>>>>>>
private int handleRestResponse(Command command, HttpResponse httpResponse) throws Exception {
logger.log(Level.FINE, "Received HttpResponse: " + httpResponse);
String responseStr = IOUtils.toString(httpResponse.getEntity().getContent());
logger.log(Level.FINE, "Responding to message with responseString: " + responseStr);
Response response = MessageFactory.createResponse(responseStr);
if (response instanceof FolderResponse) {
FolderResponse folderResponse = (FolderResponse) response;
command.printResults(folderResponse.getResult());
return 0;
}
else if (response instanceof AlreadySyncingResponse) {
out.println("Daemon is already syncing, please retry later.");
return 1;
}
else if (response instanceof BadRequestResponse) {
out.println("Invalid Request : " + response.getMessage());
return 1;
}
return 1;
} |
<<<<<<<
return new Config(localDir, applicationContext, configTO, repoTO);
=======
String pluginId = (configTO.getConnectionTO() != null) ? configTO.getConnectionTO().getType() : null;
Plugin plugin = Plugins.get(pluginId);
if (plugin == null) {
logger.log(Level.WARNING, "Not loading config! Plugin with id '{0}' does not exist.", pluginId);
return null;
}
else {
logger.log(Level.INFO, "Initializing Config instance ...");
return new Config(localDir, configTO, repoTO);
}
>>>>>>>
String pluginId = (configTO.getConnectionTO() != null) ? configTO.getConnectionTO().getType() : null;
Plugin plugin = Plugins.get(pluginId);
if (plugin == null) {
logger.log(Level.WARNING, "Not loading config! Plugin with id '{0}' does not exist.", pluginId);
return null;
}
else {
logger.log(Level.INFO, "Initializing Config instance ...");
return new Config(localDir, applicationContext, configTO, repoTO);
} |
<<<<<<<
import org.apache.commons.codec.binary.Base64;
=======
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
>>>>>>>
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.codec.binary.Base64;
<<<<<<<
import org.syncany.plugins.util.PluginUtil;
=======
import org.syncany.util.Base58;
>>>>>>>
import org.syncany.plugins.util.PluginUtil;
import org.syncany.util.Base58;
<<<<<<<
String plaintextEncodedStorage = new String(Base64.encodeBase64(plaintextStorageXml, false));
String plaintextEncodedPlugin = new String(Base64.encodeBase64(connectionTO.getType().getBytes()));
=======
String plaintextEncodedStorageXml = new String(Base58.encode(plaintextStorageXml));
>>>>>>>
String plaintextEncodedStorage = Base58.encode(plaintextStorageXml);
String plaintextEncodedPlugin = Base58.encode(connectionTO.getType().getBytes()); |
<<<<<<<
/**
* @see #{Context.BindServiceFlags}
* @param flags
*/
void setBindServiceFlags(int flags);
=======
void setKVStorage(KVStorage kvStorage);
>>>>>>>
void setKVStorage(KVStorage kvStorage);
/**
* @see #{Context.BindServiceFlags}
* @param flags
*/
void setBindServiceFlags(int flags); |
<<<<<<<
nSkipped = 0;
nProcessed = 0;
=======
>>>>>>>
nSkipped = 0;
nProcessed = 0;
<<<<<<<
// TODO debug
StringBuilder sadValsString = new StringBuilder();
for (int k = 0; k < sadVals.length - 1; k++) {
sadValsString.append(String.format("%f,", sadVals[k]));
}
sadValsString.append(String.format("%f", sadVals[sadVals.length - 1])); // very awkward to prevent trailing ,
if (sadValueLogger.isEnabled()) { // TODO debug
sadValueLogger.log(sadValsString.toString());
}
if (showSliceBitMap) {
// TODO danger, drawing outside AWT thread
drawMatching(result, ein, slices); // ein.x >> result.scale, ein.y >> result.scale, (int) result.dx >> result.scale, (int) result.dy >> result.scale, slices[sliceIndex(1)][result.scale], slices[sliceIndex(2)][result.scale], result.scale);
}
=======
if (showSliceBitMap) {
// TODO danger, drawing outside AWT thread
drawMatching(ein.x >> result.scale, ein.y >> result.scale, (int) result.dx >> result.scale, (int) result.dy >> result.scale, slices[sliceIndex(1)][result.scale], slices[sliceIndex(2)][result.scale], result.scale);
}
>>>>>>>
// TODO debug
StringBuilder sadValsString = new StringBuilder();
for (int k = 0; k < sadVals.length - 1; k++) {
sadValsString.append(String.format("%f,", sadVals[k]));
}
sadValsString.append(String.format("%f", sadVals[sadVals.length - 1])); // very awkward to prevent trailing ,
if (sadValueLogger.isEnabled()) { // TODO debug
sadValueLogger.log(sadValsString.toString());
}
if (showSliceBitMap) {
// TODO danger, drawing outside AWT thread
drawMatching(result, ein, slices); // ein.x >> result.scale, ein.y >> result.scale, (int) result.dx >> result.scale, (int) result.dy >> result.scale, slices[sliceIndex(1)][result.scale], slices[sliceIndex(2)][result.scale], result.scale);
}
<<<<<<<
=======
adaptEventSkipping();
>>>>>>>
<<<<<<<
switch (sliceMethod) {
case ConstantDuration:
if (adapativeSliceDurationUseProportionalControl) { // proportional
setSliceDurationUs(Math.round((1 / (1 + (err - 1) * adapativeSliceDurationProportionalErrorGain)) * sliceDurationUs));
} else { // bang bang
int durChange = (int) (-errSign * adapativeSliceDurationProportionalErrorGain * sliceDurationUs);
setSliceDurationUs(sliceDurationUs + durChange);
}
break;
case ConstantEventNumber:
case AreaEventNumber:
if (adapativeSliceDurationUseProportionalControl) { // proportional
setSliceEventCount(Math.round((1 / (1 + (err - 1) * adapativeSliceDurationProportionalErrorGain)) * sliceEventCount));
} else {
if (errSign < 0) { // match distance too short, increase duration
=======
switch (sliceMethod) {
case ConstantDuration:
int durChange = (int) (errSign * adapativeSliceDurationProportionalErrorGain * sliceDurationUs);
setSliceDurationUs(sliceDurationUs);
break;
case ConstantEventNumber:
case AreaEventNumber:
if (errSign > 0 && sliceDeltaTimeUs(2) < getSliceDurationUs()) { // don't increase slice past the sliceDurationUs limit
>>>>>>>
switch (sliceMethod) {
case ConstantDuration:
if (adapativeSliceDurationUseProportionalControl) { // proportional
setSliceDurationUs(Math.round((1 / (1 + (err - 1) * adapativeSliceDurationProportionalErrorGain)) * sliceDurationUs));
} else { // bang bang
int durChange = (int) (-errSign * adapativeSliceDurationProportionalErrorGain * sliceDurationUs);
setSliceDurationUs(sliceDurationUs + durChange);
}
break;
case ConstantEventNumber:
case AreaEventNumber:
if (adapativeSliceDurationUseProportionalControl) { // proportional
setSliceEventCount(Math.round((1 / (1 + (err - 1) * adapativeSliceDurationProportionalErrorGain)) * sliceEventCount));
} else {
if (errSign < 0) { // match distance too short, increase duration
<<<<<<<
nSkipped++;
return false;
=======
// return false;
>>>>>>>
nSkipped++;
return false;
<<<<<<<
final int xsub = x >> subSampleBy;
final int ysub = y >> subSampleBy;
final int r = ((blockDimension) / 2);
int w = subSizeX >> subSampleBy, h = subSizeY >> subSampleBy;
// Make sure both ref block and past slice block are in bounds on all sides or there'll be arrayIndexOutOfBoundary exception.
// Also we don't want to match ref block only on inner sides or there will be a bias towards motion towards middle
if (xsub - r - searchDistance < 0 || xsub + r + searchDistance >= w
|| ysub - r - searchDistance < 0 || ysub + r + searchDistance >= h) {
result.sadValue = Float.MAX_VALUE; // return very large distance for this match so it is not selected
return result;
}
=======
// Make sure both ref block and past slice block are in bounds on all sides or there'll be arrayIndexOutOfBoundary exception.
// Also we don't want to match ref block only on inner sides or there will be a bias towards motion towards middle
if (xsub - r - searchDistance < 0 || xsub + r + searchDistance >= w
|| ysub - r - searchDistance < 0 || ysub + r + searchDistance >= h) {
result.sadValue = Float.MAX_VALUE; // return very large distance for this match so it is not selected
return result;
}
>>>>>>>
// Make sure both ref block and past slice block are in bounds on all sides or there'll be arrayIndexOutOfBoundary exception.
// Also we don't want to match ref block only on inner sides or there will be a bias towards motion towards middle
if (xsub - r - searchDistance < 0 || xsub + r + searchDistance >= w
|| ysub - r - searchDistance < 0 || ysub + r + searchDistance >= h) {
result.sadValue = Float.MAX_VALUE; // return very large distance for this match so it is not selected
return result;
}
<<<<<<<
// int w = subSizeX >> subsampleBy, h = subSizeY >> subsampleBy;
// int adx = dx > 0 ? dx : -dx; // abs val of dx and dy, to compute limits
// int ady = dy > 0 ? dy : -dy;
//
// // Make sure both ref block and past slice block are in bounds on all sides or there'll be arrayIndexOutOfBoundary exception.
// // Also we don't want to match ref block only on inner sides or there will be a bias towards motion towards middle
// if (x - r - adx < 0 || x + r + adx >= w
// || y - r - ady < 0 || y + r + ady >= h) {
// return 1; // tobi changed to 1 again // Float.MAX_VALUE; // return very large distance for this match so it is not selected
// }
=======
// int w = subSizeX >> subsampleBy, h = subSizeY >> subsampleBy;
// int adx = dx > 0 ? dx : -dx; // abs val of dx and dy, to compute limits
// int ady = dy > 0 ? dy : -dy;
//
// // Make sure both ref block and past slice block are in bounds on all sides or there'll be arrayIndexOutOfBoundary exception.
// // Also we don't want to match ref block only on inner sides or there will be a bias towards motion towards middle
// if (x - r - adx < 0 || x + r + adx >= w
// || y - r - ady < 0 || y + r + ady >= h) {
// return Float.MAX_VALUE; // return very large distance for this match so it is not selected
// }
>>>>>>>
// int w = subSizeX >> subsampleBy, h = subSizeY >> subsampleBy;
// int adx = dx > 0 ? dx : -dx; // abs val of dx and dy, to compute limits
// int ady = dy > 0 ? dy : -dy;
//
// // Make sure both ref block and past slice block are in bounds on all sides or there'll be arrayIndexOutOfBoundary exception.
// // Also we don't want to match ref block only on inner sides or there will be a bias towards motion towards middle
// if (x - r - adx < 0 || x + r + adx >= w
// || y - r - ady < 0 || y + r + ady >= h) {
// return 1; // tobi changed to 1 again // Float.MAX_VALUE; // return very large distance for this match so it is not selected
// } |
<<<<<<<
import java.awt.geom.Point2D;
=======
import com.jmatio.io.MatFileWriter;
import com.jmatio.types.MLDouble;
>>>>>>>
import java.awt.geom.Point2D;
import com.jmatio.io.MatFileWriter;
import com.jmatio.types.MLDouble;
<<<<<<<
/** computes statistics and clear buffers of accumulated values */
void bufferMean() {
=======
void bufferMean(int currentTs) {
>>>>>>>
void bufferMean(int currentTs) { |
<<<<<<<
loadLabels(new File(getLastManuallyLoadedLabels()));
=======
sendUDPMessage(CMD_RESET_TO_BASE_NETWORK);
>>>>>>>
loadLabels(new File(getLastManuallyLoadedLabels()));
sendUDPMessage(CMD_RESET_TO_BASE_NETWORK); |
<<<<<<<
import de.metas.rest_api.invoicecandidates.request.JsonRequestInvoiceCandidateExternalIdSpec;
import de.metas.util.lang.ExternalHeaderIdWithExternalLineIds;
import de.metas.util.lang.ExternalId;
=======
import de.metas.rest_api.invoicecandidates.request.JsonInvoiceCandidateReference;
import de.metas.util.rest.ExternalHeaderAndLineId;
import de.metas.util.rest.ExternalId;
>>>>>>>
import de.metas.rest_api.invoicecandidates.request.JsonInvoiceCandidateReference;
import de.metas.util.lang.ExternalHeaderIdWithExternalLineIds;
import de.metas.util.lang.ExternalId;
<<<<<<<
final JsonRequestInvoiceCandidateExternalIdSpec jic1 = JsonRequestInvoiceCandidateExternalIdSpec.builder()
=======
final JsonInvoiceCandidateReference jic1 = JsonInvoiceCandidateReference.builder()
>>>>>>>
final JsonInvoiceCandidateReference jic1 = JsonInvoiceCandidateReference.builder()
<<<<<<<
final JsonRequestInvoiceCandidateExternalIdSpec jic2 = JsonRequestInvoiceCandidateExternalIdSpec.builder()
=======
final JsonInvoiceCandidateReference jic2 = JsonInvoiceCandidateReference.builder()
>>>>>>>
final JsonInvoiceCandidateReference jic2 = JsonInvoiceCandidateReference.builder()
<<<<<<<
final List<ExternalHeaderIdWithExternalLineIds> headerAndLineIds = jsonConverter.convertJICToExternalHeaderAndLineIds(ImmutableList.of(jic1, jic2));
=======
final List<ExternalHeaderAndLineId> headerAndLineIds = InvoiceJsonConverters.fromJson(ImmutableList.of(jic1, jic2));
>>>>>>>
final List<ExternalHeaderIdWithExternalLineIds> headerAndLineIds = InvoiceJsonConverters.fromJson(ImmutableList.of(jic1, jic2)); |
<<<<<<<
import org.adempiere.util.Services;
import org.adempiere.warehouse.LocatorId;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseBL;
=======
>>>>>>>
import org.adempiere.warehouse.LocatorId;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseBL; |
<<<<<<<
=======
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.saveRecord;
import java.math.BigDecimal;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import javax.annotation.Nullable;
import de.metas.common.util.time.SystemTime;
import org.adempiere.ad.trx.api.ITrx;
import org.adempiere.exceptions.FillMandatoryException;
import org.adempiere.mm.attributes.AttributeCode;
import org.adempiere.mm.attributes.AttributeId;
import org.adempiere.mm.attributes.AttributeListValue;
import org.adempiere.mm.attributes.AttributeSetInstanceId;
import org.adempiere.mm.attributes.api.AttributeConstants;
import org.adempiere.mm.attributes.api.AttributeListValueCreateRequest;
import org.adempiere.mm.attributes.api.IAttributeDAO;
import org.adempiere.mm.attributes.api.IAttributeSetInstanceBL;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.lang.IMutable;
import org.adempiere.warehouse.LocatorId;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseBL;
import org.adempiere.warehouse.api.IWarehouseDAO;
import org.compiere.SpringContextHolder;
import org.compiere.model.I_C_UOM;
import org.compiere.model.I_I_Inventory;
import org.compiere.model.I_M_Attribute;
import org.compiere.model.I_M_AttributeInstance;
import org.compiere.model.I_M_AttributeSetInstance;
import org.compiere.model.X_C_DocType;
import org.compiere.model.X_I_Inventory;
import org.slf4j.Logger;
>>>>>>> |
<<<<<<<
package org.adempiere.acct.api;
/*
* #%L
* de.metas.adempiere.adempiere.base
* %%
* Copyright (C) 2015 metas GmbH
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-2.0.html>.
* #L%
*/
import java.sql.ResultSet;
import java.util.List;
import java.util.Properties;
import org.adempiere.util.ISingletonService;
import org.adempiere.util.lang.impl.TableRecordReference;
import org.compiere.acct.Doc;
import org.compiere.acct.PostingExecutionException;
import org.compiere.model.MAcctSchema;
/**
* Accountable document factory. Use this interface to create the right {@link Doc} instance for your accountable document.
*
* @author tsa
*
*/
public interface IDocFactory extends ISingletonService
{
/**
* @return Document or <code>null</code> if there is no such accountable document for given AD_Table_ID/Record_ID
* @throws PostingExecutionException if the document could not be created
*/
Doc<?> getOrNull(Properties ctx, MAcctSchema[] ass, TableRecordReference documentRef);
/**
* Create Accountable document
*
* @param docMetaInfo accountable document descriptor
* @param ass accounting schemas
* @param rs result set
* @param trxName
* @return Document; never returns <code>null</code>
* @throws PostingExecutionException if the document could not be created
*/
Doc<?> get(final Properties ctx, IDocMetaInfo docMetaInfo, MAcctSchema[] ass, ResultSet rs, String trxName);
/**
*
* @return a list of all accountable documents (meta data), registered on system
*/
List<IDocMetaInfo> getDocMetaInfoList();
}
=======
package org.adempiere.acct.api;
/*
* #%L
* de.metas.adempiere.adempiere.base
* %%
* Copyright (C) 2015 metas GmbH
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-2.0.html>.
* #L%
*/
import java.sql.ResultSet;
import java.util.List;
import java.util.Properties;
import org.adempiere.util.lang.impl.TableRecordReference;
import org.compiere.acct.Doc;
import org.compiere.acct.PostingExecutionException;
import org.compiere.model.MAcctSchema;
import de.metas.util.ISingletonService;
/**
* Accountable document factory. Use this interface to create the right {@link Doc} instance for your accountable document.
*
* @author tsa
*
*/
public interface IDocFactory extends ISingletonService
{
/**
* @return Document or <code>null</code> if there is no such accountable document for given AD_Table_ID/Record_ID
* @throws PostingExecutionException if the document could not be created
*/
Doc getOrNull(Properties ctx, MAcctSchema[] ass, TableRecordReference documentRef);
/**
* Create Accountable document
*
* @param docMetaInfo accountable document descriptor
* @param ass accounting schemas
* @param rs result set
* @param trxName
* @return Document; never returns <code>null</code>
* @throws PostingExecutionException if the document could not be created
*/
Doc get(final Properties ctx, IDocMetaInfo docMetaInfo, MAcctSchema[] ass, ResultSet rs, String trxName);
/**
*
* @return a list of all accountable documents (meta data), registered on system
*/
List<IDocMetaInfo> getDocMetaInfoList();
}
>>>>>>>
package org.adempiere.acct.api;
/*
* #%L
* de.metas.adempiere.adempiere.base
* %%
* Copyright (C) 2015 metas GmbH
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-2.0.html>.
* #L%
*/
import java.sql.ResultSet;
import java.util.List;
import java.util.Properties;
import org.adempiere.util.lang.impl.TableRecordReference;
import org.compiere.acct.Doc;
import org.compiere.acct.PostingExecutionException;
import org.compiere.model.MAcctSchema;
import de.metas.util.ISingletonService;
/**
* Accountable document factory. Use this interface to create the right {@link Doc} instance for your accountable document.
*
* @author tsa
*
*/
public interface IDocFactory extends ISingletonService
{
/**
* @return Document or <code>null</code> if there is no such accountable document for given AD_Table_ID/Record_ID
* @throws PostingExecutionException if the document could not be created
*/
Doc<?> getOrNull(Properties ctx, MAcctSchema[] ass, TableRecordReference documentRef);
/**
* Create Accountable document
*
* @param docMetaInfo accountable document descriptor
* @param ass accounting schemas
* @param rs result set
* @param trxName
* @return Document; never returns <code>null</code>
* @throws PostingExecutionException if the document could not be created
*/
Doc<?> get(final Properties ctx, IDocMetaInfo docMetaInfo, MAcctSchema[] ass, ResultSet rs, String trxName);
/**
*
* @return a list of all accountable documents (meta data), registered on system
*/
List<IDocMetaInfo> getDocMetaInfoList();
} |
<<<<<<<
import static org.adempiere.model.InterfaceWrapperHelper.loadOutOfTrx;
=======
>>>>>>>
import static org.adempiere.model.InterfaceWrapperHelper.loadOutOfTrx;
<<<<<<<
import org.adempiere.ad.dao.IQueryBL;
=======
>>>>>>>
import org.adempiere.ad.dao.IQueryBL;
<<<<<<<
@Deprecated
public static MProduct get(final Properties ctx_NOTUSED, final int M_Product_ID)
=======
@Deprecated
public static MProduct get(Properties ctx_IGNORED, int M_Product_ID)
>>>>>>>
@Deprecated
public static MProduct get(final Properties ctx_NOTUSED, final int M_Product_ID)
<<<<<<<
final I_M_Product product = loadOutOfTrx(M_Product_ID, I_M_Product.class);
=======
final I_M_Product product = Services.get(IProductDAO.class).getById(M_Product_ID);
>>>>>>>
final I_M_Product product = loadOutOfTrx(M_Product_ID, I_M_Product.class);
<<<<<<<
=======
/**
* Get MProduct using UPC/EAN (case sensitive)
*
* @param ctx Context
* @param upc The upc to look for
* @return List of MProduct
*/
@Deprecated
public static List<MProduct> getByUPC(Properties ctx, String upc, String trxName)
{
String whereClause = "AD_Client_ID=? AND UPC=?";
Query q = new Query(ctx, Table_Name, whereClause, trxName);
q.setParameters(new Object[] { Env.getAD_Client_ID(ctx), upc });
return (q.list(MProduct.class));
}
/**************************************************************************
* Standard Constructor
*
* @param ctx context
* @param M_Product_ID id
* @param trxName transaction
*/
>>>>>>>
<<<<<<<
=======
* Parent Constructor
*
* @param et parent
*/
MProduct(MExpenseType et)
{
this(et.getCtx(), 0, et.get_TrxName());
setProductType(X_M_Product.PRODUCTTYPE_ExpenseType);
setExpenseType(et);
} // MProduct
// /**
// * Parent Constructor
// *
// * @param resource parent
// * @param resourceType resource type
// */
// public MProduct(MResource resource, MResourceType resourceType)
// {
// this(resource.getCtx(), 0, resource.get_TrxName());
// setAD_Org_ID(resource.getAD_Org_ID());
// setProductType(X_M_Product.PRODUCTTYPE_Resource);
// setResource(resource);
// setResource(resourceType);
// } // MProduct
/**
>>>>>>>
<<<<<<<
=======
MCost.delete(this);
// [ 1674225 ] Delete Product: Costing deletion error
/*
* MAcctSchema[] mass = MAcctSchema.getClientAcctSchema(getCtx(),getAD_Client_ID(), get_TrxName()); for(int i=0; i<mass.length; i++) { // Get Cost Elements MCostElement[] ces =
* MCostElement.getMaterialWithCostingMethods(this); MCostElement ce = null; for(int j=0; j<ces.length; j++) { if(MCostElement.COSTINGMETHOD_StandardCosting.equals(ces[i].getCostingMethod()))
* { ce = ces[i]; break; } }
*
* if(ce == null) continue;
*
* MCost mcost = MCost.get(this, 0, mass[i], 0, ce.getM_CostElement_ID()); mcost.delete(true, get_TrxName()); }
*/
>>>>>>> |
<<<<<<<
import org.adempiere.util.Services;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseDAO;
=======
>>>>>>>
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseDAO; |
<<<<<<<
.salesOrderId(purchaseCandidate.getSalesOrderId())
.rowType(PurchaseRowType.LINE).product(product)
.purchasePriceActual(purchasePriceActual.getValue())
.customerPriceGrossProfit(customerPriceGrossProfit.getValue())
.percentGrossProfit(percentGrossProfit.getValueAsBigDecimal())
=======
.rowType(PurchaseRowType.LINE)
.product(product)
.grossProfitPrice(purchaseCandidate.getGrossProfitPrice())
>>>>>>>
.rowType(PurchaseRowType.LINE)
.product(product)
.purchasePriceActual(purchasePriceActual.getValue())
.customerPriceGrossProfit(customerPriceGrossProfit.getValue())
.percentGrossProfit(percentGrossProfit.getValueAsBigDecimal())
<<<<<<<
.rowId(parentRow
.getRowId()
.withAvailability(availabilityResult.getType(), createRandomString()))
.salesOrderId(parentRow.getSalesOrderId())
.rowType(PurchaseRowType.AVAILABILITY_DETAIL)
.qtyToPurchase(availabilityResult.getQty())
.readonly(true)
.uomOrAvailablility(availability)
.datePromised(TimeUtil.asDate(availabilityResult.getDatePromised()))
.build();
=======
.rowId(parentRow.getRowId().withAvailability(availabilityResult.getType(), createRandomString()))
.rowType(PurchaseRowType.AVAILABILITY_DETAIL)
.qtyToPurchase(availabilityResult.getQty())
.readonly(true)
.uomOrAvailablility(availability)
.datePromised(TimeUtil.asTimestamp(availabilityResult.getDatePromised()))
.build();
>>>>>>>
.rowId(parentRow
.getRowId()
.withAvailability(availabilityResult.getType(), createRandomString()))
.salesOrderId(parentRow.getSalesOrderId())
.rowType(PurchaseRowType.AVAILABILITY_DETAIL)
.qtyToPurchase(availabilityResult.getQty())
.readonly(true)
.uomOrAvailablility(availability)
.datePromised(TimeUtil.asDate(availabilityResult.getDatePromised()))
.build();
<<<<<<<
.salesOrderId(parentRow.getSalesOrderId()).rowType(PurchaseRowType.AVAILABILITY_DETAIL)
.qtyToPurchase(BigDecimal.ZERO)
.readonly(true)
.uomOrAvailablility(Util
.coalesce(
throwable.getLocalizedMessage(),
throwable.getMessage(),
throwable.getClass().getName()))
=======
.rowType(PurchaseRowType.AVAILABILITY_DETAIL)
.qtyToPurchase(BigDecimal.ZERO)
.readonly(true)
.uomOrAvailablility(Util.coalesce(throwable.getLocalizedMessage(), throwable.getMessage(), throwable.getClass().getName()))
>>>>>>>
.salesOrderId(parentRow.getSalesOrderId())
.rowType(PurchaseRowType.AVAILABILITY_DETAIL)
.qtyToPurchase(BigDecimal.ZERO)
.readonly(true)
.uomOrAvailablility(Util
.coalesce(
throwable.getLocalizedMessage(),
throwable.getMessage(),
throwable.getClass().getName())) |
<<<<<<<
import java.util.stream.Stream;
=======
import java.util.Set;
>>>>>>>
import java.util.Set;
import java.util.stream.Stream;
<<<<<<<
import de.metas.inout.InOutId;
=======
import de.metas.inout.InOutAndLineId;
import de.metas.inout.InOutId;
>>>>>>>
import de.metas.inout.InOutAndLineId;
import de.metas.inout.InOutId;
<<<<<<<
@Override
public Stream<InOutId> streamInOutIdsByBPartnerId(@NonNull final BPartnerId bpartnerId)
{
return Services.get(IQueryBL.class)
.createQueryBuilder(I_M_InOut.class)
.addEqualsFilter(I_M_InOut.COLUMN_C_BPartner_ID, bpartnerId)
.create()
.listIds(InOutId::ofRepoId)
.stream();
}
=======
@Override
public Set<InOutAndLineId> retrieveLinesForInOutId(final InOutId inOutId)
{
final I_M_InOut inOut = load(inOutId.getRepoId(), I_M_InOut.class);
return retrieveLines(inOut)
.stream()
.map(line -> InOutAndLineId.ofRepoId(inOut.getM_InOut_ID(), line.getM_InOutLine_ID()))
.collect(ImmutableSet.toImmutableSet());
}
>>>>>>>
@Override
public Stream<InOutId> streamInOutIdsByBPartnerId(@NonNull final BPartnerId bpartnerId)
{
return Services.get(IQueryBL.class)
.createQueryBuilder(I_M_InOut.class)
.addEqualsFilter(I_M_InOut.COLUMN_C_BPartner_ID, bpartnerId)
.create()
.listIds(InOutId::ofRepoId)
.stream();
}
@Override
public Set<InOutAndLineId> retrieveLinesForInOutId(final InOutId inOutId)
{
final I_M_InOut inOut = load(inOutId.getRepoId(), I_M_InOut.class);
return retrieveLines(inOut)
.stream()
.map(line -> InOutAndLineId.ofRepoId(inOut.getM_InOut_ID(), line.getM_InOutLine_ID()))
.collect(ImmutableSet.toImmutableSet());
} |
<<<<<<<
import org.adempiere.util.Services;
import org.compiere.model.I_C_AcctSchema;
=======
import org.adempiere.model.InterfaceWrapperHelper;
>>>>>>>
import org.compiere.model.I_C_AcctSchema;
<<<<<<<
=======
import de.metas.quantity.Quantity;
import de.metas.util.Services;
>>>>>>>
import de.metas.util.Services; |
<<<<<<<
import graphql.execution.instrumentation.Instrumentation;
import graphql.execution.instrumentation.InstrumentationContext;
import graphql.execution.instrumentation.NoOpInstrumentation;
import graphql.execution.instrumentation.parameters.ExecutionParameters;
import graphql.execution.instrumentation.parameters.ValidationParameters;
=======
import graphql.execution.SimpleExecutionStrategy;
>>>>>>>
import graphql.execution.SimpleExecutionStrategy;
import graphql.execution.instrumentation.Instrumentation;
import graphql.execution.instrumentation.InstrumentationContext;
import graphql.execution.instrumentation.NoOpInstrumentation;
import graphql.execution.instrumentation.parameters.ExecutionParameters;
import graphql.execution.instrumentation.parameters.ValidationParameters; |
<<<<<<<
import org.adempiere.archive.api.ArchiveAction;
import org.adempiere.archive.api.ArchiveEmailSentStatus;
import org.adempiere.archive.api.ArchivePrintOutStatus;
import org.adempiere.archive.api.IArchiveEventManager;
import org.compiere.model.I_AD_Archive;
=======
import org.adempiere.archive.api.IArchiveEventManager;
import org.compiere.model.I_AD_Archive;
>>>>>>>
import org.adempiere.archive.api.ArchiveAction;
import org.adempiere.archive.api.ArchiveEmailSentStatus;
import org.adempiere.archive.api.ArchivePrintOutStatus;
import org.adempiere.archive.api.IArchiveEventManager;
import org.compiere.model.I_AD_Archive;
<<<<<<<
default void onPdfUpdate(
final I_AD_Archive archive,
final UserId userId)
=======
default void onPdfUpdate(I_AD_Archive archive, UserId userId)
{
// nothing
}
default void onPdfUpdate(I_AD_Archive archive, UserId userId, String action)
>>>>>>>
default void onPdfUpdate(I_AD_Archive archive, UserId userId)
{
// nothing
}
default void onPdfUpdate(
final I_AD_Archive archive,
final UserId userId) |
<<<<<<<
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.saveRecord;
import java.math.BigDecimal;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import javax.annotation.Nullable;
import de.metas.common.util.time.SystemTime;
import org.adempiere.ad.trx.api.ITrx;
import org.adempiere.exceptions.FillMandatoryException;
import org.adempiere.mm.attributes.AttributeCode;
import org.adempiere.mm.attributes.AttributeId;
import org.adempiere.mm.attributes.AttributeListValue;
import org.adempiere.mm.attributes.AttributeSetInstanceId;
import org.adempiere.mm.attributes.api.AttributeConstants;
import org.adempiere.mm.attributes.api.AttributeListValueCreateRequest;
import org.adempiere.mm.attributes.api.IAttributeDAO;
import org.adempiere.mm.attributes.api.IAttributeSetInstanceBL;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.lang.IMutable;
import org.adempiere.warehouse.LocatorId;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseBL;
import org.adempiere.warehouse.api.IWarehouseDAO;
import org.compiere.SpringContextHolder;
import org.compiere.model.I_C_UOM;
import org.compiere.model.I_I_Inventory;
import org.compiere.model.I_M_Attribute;
import org.compiere.model.I_M_AttributeInstance;
import org.compiere.model.I_M_AttributeSetInstance;
import org.compiere.model.X_C_DocType;
import org.compiere.model.X_I_Inventory;
import org.slf4j.Logger;
=======
>>>>>>>
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.saveRecord;
import java.math.BigDecimal;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import javax.annotation.Nullable;
import org.adempiere.ad.trx.api.ITrx;
import org.adempiere.exceptions.FillMandatoryException;
import org.adempiere.mm.attributes.AttributeCode;
import org.adempiere.mm.attributes.AttributeId;
import org.adempiere.mm.attributes.AttributeListValue;
import org.adempiere.mm.attributes.AttributeSetInstanceId;
import org.adempiere.mm.attributes.api.AttributeConstants;
import org.adempiere.mm.attributes.api.AttributeListValueCreateRequest;
import org.adempiere.mm.attributes.api.IAttributeDAO;
import org.adempiere.mm.attributes.api.IAttributeSetInstanceBL;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.lang.IMutable;
import org.adempiere.warehouse.LocatorId;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseBL;
import org.adempiere.warehouse.api.IWarehouseDAO;
import org.compiere.SpringContextHolder;
import org.compiere.model.I_C_UOM;
import org.compiere.model.I_I_Inventory;
import org.compiere.model.I_M_Attribute;
import org.compiere.model.I_M_AttributeInstance;
import org.compiere.model.I_M_AttributeSetInstance;
import org.compiere.model.X_C_DocType;
import org.compiere.model.X_I_Inventory;
import org.slf4j.Logger; |
<<<<<<<
import org.adempiere.util.Services;
import org.adempiere.warehouse.WarehouseId;
=======
>>>>>>>
import org.adempiere.warehouse.WarehouseId; |
<<<<<<<
import org.adempiere.util.Services;
import org.compiere.Adempiere;
import org.compiere.model.I_M_Cost;
=======
>>>>>>>
import org.compiere.Adempiere;
import org.compiere.model.I_M_Cost; |
<<<<<<<
import org.adempiere.ad.dao.QueryLimit;
=======
import lombok.NonNull;
>>>>>>>
import org.adempiere.ad.dao.QueryLimit;
import lombok.NonNull; |
<<<<<<<
import de.metas.common.util.CoalesceUtil;
import de.metas.common.util.time.SystemTime;
=======
import de.metas.common.util.CoalesceUtil;
>>>>>>>
import de.metas.common.util.CoalesceUtil;
import de.metas.common.util.time.SystemTime;
<<<<<<<
=======
import de.metas.util.time.SystemTime;
>>>>>>>
<<<<<<<
import org.adempiere.archive.ArchiveId;
import org.adempiere.archive.api.ArchiveAction;
import org.adempiere.archive.api.ArchiveEmailSentStatus;
import org.adempiere.archive.api.ArchivePrintOutStatus;
import org.adempiere.archive.spi.IArchiveEventListener;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.lang.ITableRecordReference;
import org.adempiere.util.lang.impl.TableRecordReference;
import org.compiere.Adempiere;
import org.compiere.model.I_AD_Archive;
import org.compiere.util.Env;
import org.compiere.util.TimeUtil;
import org.springframework.stereotype.Component;
import javax.annotation.Nullable;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
import java.util.Properties;
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.save;
=======
import org.adempiere.archive.ArchiveId;
import org.adempiere.archive.api.IArchiveEventManager;
import org.adempiere.archive.spi.IArchiveEventListener;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.lang.ITableRecordReference;
import org.adempiere.util.lang.impl.TableRecordReference;
import org.compiere.Adempiere;
import org.compiere.model.I_AD_Archive;
import org.compiere.util.TimeUtil;
import org.springframework.stereotype.Component;
import javax.annotation.Nullable;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
import java.util.Properties;
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.save;
>>>>>>>
import org.adempiere.archive.ArchiveId;
import org.adempiere.archive.api.ArchiveAction;
import org.adempiere.archive.api.ArchiveEmailSentStatus;
import org.adempiere.archive.api.ArchivePrintOutStatus;
import org.adempiere.archive.spi.IArchiveEventListener;
import org.adempiere.model.InterfaceWrapperHelper;
import org.adempiere.util.lang.ITableRecordReference;
import org.adempiere.util.lang.impl.TableRecordReference;
import org.compiere.Adempiere;
import org.compiere.model.I_AD_Archive;
import org.compiere.util.Env;
import org.compiere.util.TimeUtil;
import org.springframework.stereotype.Component;
import javax.annotation.Nullable;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
import java.util.Properties;
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.save;
<<<<<<<
public void onPdfUpdate(
@Nullable final I_AD_Archive archive,
@Nullable final UserId userId)
=======
public void onPdfUpdate(@Nullable final I_AD_Archive archive, @Nullable final UserId userId)
{
onPdfUpdate(archive, userId, X_C_Doc_Outbound_Log_Line.ACTION_PdfExport);
}
@Override
public void onPdfUpdate(@Nullable final I_AD_Archive archive, @Nullable final UserId userId, @NonNull final String action)
>>>>>>>
public void onPdfUpdate(@Nullable final I_AD_Archive archive, @Nullable final UserId userId)
{
onPdfUpdate(archive, userId, X_C_Doc_Outbound_Log_Line.ACTION_PdfExport);
}
@Override
public void onPdfUpdate(@Nullable final I_AD_Archive archive, @Nullable final UserId userId, @NonNull final String action) |
<<<<<<<
import graphql.Scalars;
=======
import graphql.StarWarsData;
>>>>>>>
import graphql.StarWarsData;
import graphql.Scalars;
<<<<<<<
import java.util.HashMap;
import java.util.Map;
=======
import java.io.File;
>>>>>>>
import java.io.File;
import java.util.HashMap;
import java.util.Map;
<<<<<<<
@SuppressWarnings({"unused", "Convert2Lambda", "UnnecessaryLocalVariable"})
=======
@SuppressWarnings({"unused", "Convert2Lambda", "ConstantConditions", "Anonymous2MethodRef", "UnnecessaryLocalVariable"})
>>>>>>>
@SuppressWarnings({"unused", "Convert2Lambda", "UnnecessaryLocalVariable"}) |
<<<<<<<
=======
import graphql.AssertException;
import graphql.Directives;
>>>>>>>
import graphql.AssertException;
import graphql.Directives;
<<<<<<<
=======
import graphql.schema.GraphQLInterfaceType;
import graphql.schema.GraphQLNamedInputType;
import graphql.schema.GraphQLNamedOutputType;
import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLOutputType;
>>>>>>>
import graphql.schema.GraphQLInterfaceType;
import graphql.schema.GraphQLNamedInputType;
import graphql.schema.GraphQLNamedOutputType;
import graphql.schema.GraphQLObjectType;
import graphql.schema.GraphQLOutputType;
<<<<<<<
import static graphql.Directives.DEPRECATED_DIRECTIVE_DEFINITION;
import static graphql.Directives.NO_LONGER_SUPPORTED;
import static graphql.Directives.SPECIFIED_BY_DIRECTIVE_DEFINITION;
import static graphql.introspection.Introspection.DirectiveLocation.valueOf;
=======
import static graphql.introspection.Introspection.DirectiveLocation.ARGUMENT_DEFINITION;
import static graphql.introspection.Introspection.DirectiveLocation.ENUM;
import static graphql.introspection.Introspection.DirectiveLocation.ENUM_VALUE;
import static graphql.introspection.Introspection.DirectiveLocation.FIELD_DEFINITION;
import static graphql.introspection.Introspection.DirectiveLocation.INPUT_FIELD_DEFINITION;
import static graphql.introspection.Introspection.DirectiveLocation.INPUT_OBJECT;
import static graphql.introspection.Introspection.DirectiveLocation.OBJECT;
import static graphql.introspection.Introspection.DirectiveLocation.SCALAR;
import static graphql.introspection.Introspection.DirectiveLocation.UNION;
import static graphql.language.DirectiveLocation.newDirectiveLocation;
import static graphql.language.NonNullType.newNonNullType;
import static graphql.language.TypeName.newTypeName;
import static graphql.schema.GraphQLEnumValueDefinition.newEnumValueDefinition;
import static graphql.schema.GraphQLTypeReference.typeRef;
>>>>>>>
import static graphql.introspection.Introspection.DirectiveLocation.ARGUMENT_DEFINITION;
import static graphql.introspection.Introspection.DirectiveLocation.ENUM;
import static graphql.introspection.Introspection.DirectiveLocation.ENUM_VALUE;
import static graphql.introspection.Introspection.DirectiveLocation.FIELD_DEFINITION;
import static graphql.introspection.Introspection.DirectiveLocation.INPUT_FIELD_DEFINITION;
import static graphql.introspection.Introspection.DirectiveLocation.INPUT_OBJECT;
import static graphql.introspection.Introspection.DirectiveLocation.OBJECT;
import static graphql.introspection.Introspection.DirectiveLocation.SCALAR;
import static graphql.introspection.Introspection.DirectiveLocation.UNION;
import static graphql.language.DirectiveLocation.newDirectiveLocation;
import static graphql.language.NonNullType.newNonNullType;
import static graphql.language.TypeName.newTypeName;
import static graphql.schema.GraphQLEnumValueDefinition.newEnumValueDefinition;
import static graphql.schema.GraphQLTypeReference.typeRef;
<<<<<<<
public Object buildValue(Value value, GraphQLType requiredType) {
Object result = null;
if (GraphQLTypeUtil.isNonNull(requiredType)) {
requiredType = unwrapOne(requiredType);
}
=======
/**
* We pass this around so we know what we have defined in a stack like manner plus
* it gives us helper functions
*/
static class BuildContext {
private final TypeDefinitionRegistry typeRegistry;
private final RuntimeWiring wiring;
private final Deque<String> typeStack = new ArrayDeque<>();
private final Map<String, GraphQLOutputType> outputGTypes = new LinkedHashMap<>();
private final Map<String, GraphQLInputType> inputGTypes = new LinkedHashMap<>();
private final Map<String, Object> directiveBehaviourContext = new LinkedHashMap<>();
private final Set<GraphQLDirective> directives = new LinkedHashSet<>();
private final GraphQLCodeRegistry.Builder codeRegistry;
public final Map<String, OperationTypeDefinition> operationTypeDefs;
BuildContext(TypeDefinitionRegistry typeRegistry, RuntimeWiring wiring, Map<String, OperationTypeDefinition> operationTypeDefinitions) {
this.typeRegistry = typeRegistry;
this.wiring = wiring;
this.codeRegistry = GraphQLCodeRegistry.newCodeRegistry(wiring.getCodeRegistry());
this.operationTypeDefs = operationTypeDefinitions;
}
public TypeDefinitionRegistry getTypeRegistry() {
return typeRegistry;
}
TypeDefinition getTypeDefinition(Type type) {
Optional<TypeDefinition> optionalTypeDefinition = typeRegistry.getType(type);
return optionalTypeDefinition.orElseThrow(
() -> new AssertException(format(" type definition for type '%s' not found", type))
);
}
boolean stackContains(TypeInfo typeInfo) {
return typeStack.contains(typeInfo.getName());
}
void push(TypeInfo typeInfo) {
typeStack.push(typeInfo.getName());
}
void pop() {
typeStack.pop();
}
SchemaGeneratorDirectiveHelper.Parameters mkBehaviourParams() {
return new SchemaGeneratorDirectiveHelper.Parameters(typeRegistry, wiring, directiveBehaviourContext, codeRegistry);
}
GraphQLOutputType hasOutputType(TypeDefinition typeDefinition) {
return outputGTypes.get(typeDefinition.getName());
}
GraphQLInputType hasInputType(TypeDefinition typeDefinition) {
return inputGTypes.get(typeDefinition.getName());
}
void putOutputType(GraphQLNamedOutputType outputType) {
outputGTypes.put(outputType.getName(), outputType);
// certain types can be both input and output types, for example enums and scalars
if (outputType instanceof GraphQLInputType) {
inputGTypes.put(outputType.getName(), (GraphQLInputType) outputType);
}
}
void putInputType(GraphQLNamedInputType inputType) {
inputGTypes.put(inputType.getName(), inputType);
// certain types can be both input and output types, for example enums and scalars
if (inputType instanceof GraphQLOutputType) {
outputGTypes.put(inputType.getName(), (GraphQLOutputType) inputType);
}
}
RuntimeWiring getWiring() {
return wiring;
}
GraphqlTypeComparatorRegistry getComparatorRegistry() {
return wiring.getComparatorRegistry();
}
public GraphQLCodeRegistry.Builder getCodeRegistry() {
return codeRegistry;
}
public void setDirectiveDefinition(GraphQLDirective directive) {
this.directives.add(directive);
}
public void setDirectives(Set<GraphQLDirective> directives) {
this.directives.addAll(directives);
}
public Set<GraphQLDirective> getDirectives() {
return directives;
}
}
static final String NO_LONGER_SUPPORTED = "No longer supported";
static final DirectiveDefinition DEPRECATED_DIRECTIVE_DEFINITION;
static final DirectiveDefinition SPECIFIED_BY_DIRECTIVE_DEFINITION;
private final SchemaGeneratorDirectiveHelper generatorDirectiveHelper = new SchemaGeneratorDirectiveHelper();
static {
DEPRECATED_DIRECTIVE_DEFINITION = DirectiveDefinition.newDirectiveDefinition()
.name(Directives.DeprecatedDirective.getName())
.directiveLocation(newDirectiveLocation().name(FIELD_DEFINITION.name()).build())
.directiveLocation(newDirectiveLocation().name(ENUM_VALUE.name()).build())
.description(createDescription("Marks the field or enum value as deprecated"))
.inputValueDefinition(
InputValueDefinition.newInputValueDefinition()
.name("reason")
.description(createDescription("The reason for the deprecation"))
.type(newTypeName().name("String").build())
.defaultValue(StringValue.newStringValue().value(NO_LONGER_SUPPORTED).build())
.build())
.build();
SPECIFIED_BY_DIRECTIVE_DEFINITION = DirectiveDefinition.newDirectiveDefinition()
.name(Directives.SpecifiedByDirective.getName())
.directiveLocation(newDirectiveLocation().name(SCALAR.name()).build())
.description(createDescription("Exposes a URL that specifies the behaviour of this scalar."))
.inputValueDefinition(
InputValueDefinition.newInputValueDefinition()
.name("url")
.description(createDescription("The URL that specifies the behaviour of this scalar."))
.type(newNonNullType(newTypeName().name("String").build()).build())
.build())
.build();
}
private static Description createDescription(String s) {
return new Description(s, null, false);
}
Object buildValue(Value value, GraphQLType requiredType) {
>>>>>>>
/**
* We pass this around so we know what we have defined in a stack like manner plus
* it gives us helper functions
*/
static class BuildContext {
private final TypeDefinitionRegistry typeRegistry;
private final RuntimeWiring wiring;
private final Deque<String> typeStack = new ArrayDeque<>();
private final Map<String, GraphQLOutputType> outputGTypes = new LinkedHashMap<>();
private final Map<String, GraphQLInputType> inputGTypes = new LinkedHashMap<>();
private final Map<String, Object> directiveBehaviourContext = new LinkedHashMap<>();
private final Set<GraphQLDirective> directives = new LinkedHashSet<>();
private final GraphQLCodeRegistry.Builder codeRegistry;
public final Map<String, OperationTypeDefinition> operationTypeDefs;
BuildContext(TypeDefinitionRegistry typeRegistry, RuntimeWiring wiring, Map<String, OperationTypeDefinition> operationTypeDefinitions) {
this.typeRegistry = typeRegistry;
this.wiring = wiring;
this.codeRegistry = GraphQLCodeRegistry.newCodeRegistry(wiring.getCodeRegistry());
this.operationTypeDefs = operationTypeDefinitions;
}
public TypeDefinitionRegistry getTypeRegistry() {
return typeRegistry;
}
TypeDefinition getTypeDefinition(Type type) {
Optional<TypeDefinition> optionalTypeDefinition = typeRegistry.getType(type);
return optionalTypeDefinition.orElseThrow(
() -> new AssertException(format(" type definition for type '%s' not found", type))
);
}
boolean stackContains(TypeInfo typeInfo) {
return typeStack.contains(typeInfo.getName());
}
void push(TypeInfo typeInfo) {
typeStack.push(typeInfo.getName());
}
void pop() {
typeStack.pop();
}
SchemaGeneratorDirectiveHelper.Parameters mkBehaviourParams() {
return new SchemaGeneratorDirectiveHelper.Parameters(typeRegistry, wiring, directiveBehaviourContext, codeRegistry);
}
GraphQLOutputType hasOutputType(TypeDefinition typeDefinition) {
return outputGTypes.get(typeDefinition.getName());
}
GraphQLInputType hasInputType(TypeDefinition typeDefinition) {
return inputGTypes.get(typeDefinition.getName());
}
void putOutputType(GraphQLNamedOutputType outputType) {
outputGTypes.put(outputType.getName(), outputType);
// certain types can be both input and output types, for example enums and scalars
if (outputType instanceof GraphQLInputType) {
inputGTypes.put(outputType.getName(), (GraphQLInputType) outputType);
}
}
void putInputType(GraphQLNamedInputType inputType) {
inputGTypes.put(inputType.getName(), inputType);
// certain types can be both input and output types, for example enums and scalars
if (inputType instanceof GraphQLOutputType) {
outputGTypes.put(inputType.getName(), (GraphQLOutputType) inputType);
}
}
RuntimeWiring getWiring() {
return wiring;
}
GraphqlTypeComparatorRegistry getComparatorRegistry() {
return wiring.getComparatorRegistry();
}
public GraphQLCodeRegistry.Builder getCodeRegistry() {
return codeRegistry;
}
public void setDirectiveDefinition(GraphQLDirective directive) {
this.directives.add(directive);
}
public void setDirectives(Set<GraphQLDirective> directives) {
this.directives.addAll(directives);
}
public Set<GraphQLDirective> getDirectives() {
return directives;
}
}
static final String NO_LONGER_SUPPORTED = "No longer supported";
static final DirectiveDefinition DEPRECATED_DIRECTIVE_DEFINITION;
static final DirectiveDefinition SPECIFIED_BY_DIRECTIVE_DEFINITION;
private final SchemaGeneratorDirectiveHelper generatorDirectiveHelper = new SchemaGeneratorDirectiveHelper();
static {
DEPRECATED_DIRECTIVE_DEFINITION = DirectiveDefinition.newDirectiveDefinition()
.name(Directives.DeprecatedDirective.getName())
.directiveLocation(newDirectiveLocation().name(FIELD_DEFINITION.name()).build())
.directiveLocation(newDirectiveLocation().name(ENUM_VALUE.name()).build())
.description(createDescription("Marks the field or enum value as deprecated"))
.inputValueDefinition(
InputValueDefinition.newInputValueDefinition()
.name("reason")
.description(createDescription("The reason for the deprecation"))
.type(newTypeName().name("String").build())
.defaultValue(StringValue.newStringValue().value(NO_LONGER_SUPPORTED).build())
.build())
.build();
SPECIFIED_BY_DIRECTIVE_DEFINITION = DirectiveDefinition.newDirectiveDefinition()
.name(Directives.SpecifiedByDirective.getName())
.directiveLocation(newDirectiveLocation().name(SCALAR.name()).build())
.description(createDescription("Exposes a URL that specifies the behaviour of this scalar."))
.inputValueDefinition(
InputValueDefinition.newInputValueDefinition()
.name("url")
.description(createDescription("The URL that specifies the behaviour of this scalar."))
.type(newNonNullType(newTypeName().name("String").build()).build())
.build())
.build();
}
private static Description createDescription(String s) {
return new Description(s, null, false);
}
Object buildValue(Value value, GraphQLType requiredType) { |
<<<<<<<
import org.adempiere.uom.api.UOMConversionContext;
import org.adempiere.util.Check;
import org.adempiere.util.Services;
=======
import org.adempiere.uom.api.IUOMConversionContext;
>>>>>>>
import org.adempiere.uom.api.UOMConversionContext; |
<<<<<<<
IEditablePricingContext setC_BPartner_ID(final int c_BPartner_ID);
=======
void setBPartnerId(final BPartnerId bpartnerId);
>>>>>>>
IEditablePricingContext setC_BPartner_ID(final BPartnerId bpartnerId); |
<<<<<<<
import de.metas.order.OrderId;
import de.metas.order.payment_reservation.OrderPaymentReservationCreateResult;
import de.metas.order.payment_reservation.OrderPaymentReservationService;
import de.metas.payment.PaymentRule;
=======
import de.metas.organization.IOrgDAO;
import de.metas.organization.OrgId;
>>>>>>>
import de.metas.order.OrderId;
import de.metas.order.payment_reservation.OrderPaymentReservationCreateResult;
import de.metas.order.payment_reservation.OrderPaymentReservationService;
import de.metas.organization.IOrgDAO;
import de.metas.organization.OrgId;
import de.metas.payment.PaymentRule; |
<<<<<<<
if (operation == MUTATION) {
result = mutationStrategy.execute(executionContext, operationRootType, root, fields);
} else if (operation == SUBSCRIPTION) {
result = subscriptionStrategy.execute(executionContext, operationRootType, root, fields);
} else {
result = queryStrategy.execute(executionContext, operationRootType, root, fields);
=======
try {
if (operation == OperationDefinition.Operation.MUTATION) {
result = mutationStrategy.execute(executionContext, parameters);
} else {
result = queryStrategy.execute(executionContext, parameters);
}
} catch (NonNullableFieldWasNullException e) {
// this means it was non null types all the way from an offending non null type
// up to the root object type and there was a a null value some where.
//
// The spec says we should return null for the data in this case
//
// http://facebook.github.io/graphql/#sec-Errors-and-Non-Nullability
//
result = new ExecutionResultImpl(null, executionContext.getErrors());
>>>>>>>
try {
if (operation == OperationDefinition.Operation.MUTATION) {
result = mutationStrategy.execute(executionContext, parameters);
} else if (operation == SUBSCRIPTION) {
result = subscriptionStrategy.execute(executionContext, parameters);
} else {
result = queryStrategy.execute(executionContext, parameters);
}
} catch (NonNullableFieldWasNullException e) {
// this means it was non null types all the way from an offending non null type
// up to the root object type and there was a a null value some where.
//
// The spec says we should return null for the data in this case
//
// http://facebook.github.io/graphql/#sec-Errors-and-Non-Nullability
//
result = new ExecutionResultImpl(null, executionContext.getErrors()); |
<<<<<<<
import de.metas.material.dispo.commons.repository.MaterialQuery;
import de.metas.material.dispo.commons.repository.StockRepository;
import de.metas.material.event.MaterialDemandEvent;
=======
>>>>>>>
import de.metas.material.dispo.commons.repository.MaterialQuery;
import de.metas.material.dispo.commons.repository.StockRepository; |
<<<<<<<
import org.adempiere.exceptions.AdempiereException;
=======
import org.adempiere.ad.dao.IQueryFilter;
>>>>>>>
import org.adempiere.exceptions.AdempiereException;
import org.adempiere.ad.dao.IQueryFilter;
<<<<<<<
try
{
final int docTypeId = computeDocType(assignableInvoiceCandidateRecord, refundConfig);
refundInvoiceCandidateRecord.setC_DocTypeInvoice_ID(docTypeId);
}
catch (final RuntimeException e)
{
throw AdempiereException.wrapIfNeeded(e).appendParametersToMessage()
.setParameter("invoiceCandidate", invoiceCandidate)
.setParameter("refundConfig", refundConfig)
.setParameter("assignableInvoiceCandidateRecord", assignableInvoiceCandidateRecord);
}
=======
// try
// {
// final int docTypeId = computeDocType(assignableInvoiceCandidateRecord, refundConfig);
// refundInvoiceCandidateRecord.setC_DocTypeInvoice_ID(docTypeId);
// }
// catch (final RuntimeException e)
// {
// throw AdempiereException.wrapIfNeeded(e).appendParametersToMessage()
// .setParameter("invoiceCandidate", invoiceCandidate)
// .setParameter("refundConfig", refundConfig)
// .setParameter("assignableInvoiceCandidateRecord", assignableInvoiceCandidateRecord);
// }
>>>>>>>
try
{
final int docTypeId = computeDocType(assignableInvoiceCandidateRecord, refundConfig);
refundInvoiceCandidateRecord.setC_DocTypeInvoice_ID(docTypeId);
}
catch (final RuntimeException e)
{
throw AdempiereException.wrapIfNeeded(e).appendParametersToMessage()
.setParameter("invoiceCandidate", invoiceCandidate)
.setParameter("refundConfig", refundConfig)
.setParameter("assignableInvoiceCandidateRecord", assignableInvoiceCandidateRecord);
} |
<<<<<<<
import java.util.Collection;
import org.adempiere.util.Check;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.collect.ImmutableSet;
=======
>>>>>>>
import java.util.Collection;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;
import com.google.common.collect.ImmutableSet;
<<<<<<<
import lombok.NonNull;
=======
import de.metas.util.Check;
>>>>>>>
import de.metas.util.Check;
import lombok.NonNull; |
<<<<<<<
protected ExecutionResult completeValueForList(ExecutionContext executionContext, ExecutionParameters parameters, List<Field> fields, Iterable<Object> result) {
List<Object> completedResults = new ArrayList<Object>();
TypeInfo typeInfo = parameters.typeInfo();
GraphQLList fieldType = typeInfo.castType(GraphQLList.class);
=======
protected ExecutionResult completeValueForList(ExecutionContext executionContext, GraphQLList fieldType, List<Field> fields, Iterable<Object> result) {
List<Object> completedResults = new ArrayList<>();
>>>>>>>
protected ExecutionResult completeValueForList(ExecutionContext executionContext, ExecutionParameters parameters, List<Field> fields, Iterable<Object> result) {
List<Object> completedResults = new ArrayList<>();
TypeInfo typeInfo = parameters.typeInfo();
GraphQLList fieldType = typeInfo.castType(GraphQLList.class); |
<<<<<<<
this.subscriptionType = subscriptionType;
this.dictionary = dictionary;
typeMap = new SchemaUtil().allTypes(this, dictionary);
=======
this.additionalTypes = additionalTypes;
typeMap = new SchemaUtil().allTypes(this, additionalTypes);
>>>>>>>
this.subscriptionType = subscriptionType;
this.additionalTypes = dictionary;
typeMap = new SchemaUtil().allTypes(this, dictionary);
}
public Set<GraphQLType> getAdditionalTypes() {
return additionalTypes;
<<<<<<<
public GraphQLSchema build(Set<GraphQLType> dictionary) {
Assert.assertNotNull(dictionary, "dictionary can't be null");
GraphQLSchema graphQLSchema = new GraphQLSchema(queryType, mutationType, subscriptionType, dictionary);
=======
public GraphQLSchema build(Set<GraphQLType> additionalTypes) {
assertNotNull(additionalTypes, "additionalTypes can't be null");
GraphQLSchema graphQLSchema = new GraphQLSchema(queryType, mutationType, additionalTypes);
>>>>>>>
public GraphQLSchema build(Set<GraphQLType> additionalTypes) {
assertNotNull(additionalTypes, "additionalTypes can't be null");
GraphQLSchema graphQLSchema = new GraphQLSchema(queryType, mutationType, subscriptionType, additionalTypes); |
<<<<<<<
import org.compiere.util.TimeUtil;
import org.eevolution.api.BOMComponentType;
import org.eevolution.api.CostCollectorType;
import org.eevolution.api.IPPOrderDAO;
=======
import org.compiere.util.Env;
>>>>>>>
import org.eevolution.api.BOMComponentType;
import org.eevolution.api.CostCollectorType;
import org.eevolution.api.IPPOrderDAO;
<<<<<<<
ppOrder.setDateDelivered(productionDate);
ppOrder.setM_Product_ID(product.getM_Product_ID());
ppOrder.setC_UOM_ID(uom.getC_UOM_ID());
=======
ppOrder.setDateDelivered(asTimestamp(productionDate));
ppOrder.setM_Product(product);
ppOrder.setC_UOM(uom);
>>>>>>>
ppOrder.setDateDelivered(asTimestamp(productionDate));
ppOrder.setM_Product_ID(product.getM_Product_ID());
ppOrder.setC_UOM_ID(uom.getC_UOM_ID()); |
<<<<<<<
.dataFetcher(new DataFetcher() {
@Override
public Object get(DataFetchingEnvironment environment) {
if (environment.getSource() instanceof GraphQLArgument) {
GraphQLArgument inputField = environment.getSource();
return inputField.getDefaultValue() != null ? print(inputField.getDefaultValue(), inputField.getType()) : null;
} else if (environment.getSource() instanceof GraphQLInputObjectField) {
GraphQLInputObjectField inputField = environment.getSource();
return inputField.getDefaultValue() != null ? print(inputField.getDefaultValue(), inputField.getType()) : null;
}
return null;
=======
.dataFetcher(environment -> {
if (environment.getSource() instanceof GraphQLArgument) {
GraphQLArgument inputField = environment.getSource();
return inputField.getDefaultValue() != null ? inputField.getDefaultValue().toString() : null;
} else if (environment.getSource() instanceof GraphQLInputObjectField) {
GraphQLInputObjectField inputField = environment.getSource();
return inputField.getDefaultValue() != null ? inputField.getDefaultValue().toString() : null;
>>>>>>>
.dataFetcher(environment -> {
if (environment.getSource() instanceof GraphQLArgument) {
GraphQLArgument inputField = environment.getSource();
return inputField.getDefaultValue() != null ? print(inputField.getDefaultValue(), inputField.getType()) : null;
} else if (environment.getSource() instanceof GraphQLInputObjectField) {
GraphQLInputObjectField inputField = environment.getSource();
return inputField.getDefaultValue() != null ? print(inputField.getDefaultValue(), inputField.getType()) : null; |
<<<<<<<
import org.adempiere.exceptions.DBException;
import org.adempiere.util.Services;
=======
>>>>>>>
import org.adempiere.exceptions.DBException; |
<<<<<<<
import de.metas.shipping.ShipperId;
=======
import de.metas.util.ISingletonService;
>>>>>>>
import de.metas.shipping.ShipperId;
import de.metas.util.ISingletonService; |
<<<<<<<
private final ExecutionId executionId;
private final ExecutionStrategy executionStrategy;
=======
private final ExecutionStrategy queryStrategy;
private final ExecutionStrategy mutationStrategy;
>>>>>>>
private final ExecutionId executionId;
private final ExecutionStrategy queryStrategy;
private final ExecutionStrategy mutationStrategy;
<<<<<<<
public ExecutionContext(GraphQLSchema graphQLSchema, ExecutionId executionId, ExecutionStrategy executionStrategy, Map<String, FragmentDefinition> fragmentsByName, OperationDefinition operationDefinition, Map<String, Object> variables, Object root) {
=======
public ExecutionContext(GraphQLSchema graphQLSchema, ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy, Map<String, FragmentDefinition> fragmentsByName, OperationDefinition operationDefinition, Map<String, Object> variables, Object root) {
>>>>>>>
public ExecutionContext(GraphQLSchema graphQLSchema, ExecutionId executionId, ExecutionStrategy queryStrategy, ExecutionStrategy mutationStrategy, Map<String, FragmentDefinition> fragmentsByName, OperationDefinition operationDefinition, Map<String, Object> variables, Object root) {
<<<<<<<
this.executionId = executionId;
this.executionStrategy = executionStrategy;
=======
this.queryStrategy = queryStrategy;
this.mutationStrategy = mutationStrategy;
>>>>>>>
this.executionId = executionId;
this.queryStrategy = queryStrategy;
this.mutationStrategy = mutationStrategy; |
<<<<<<<
=======
import java.nio.charset.StandardCharsets;
>>>>>>>
import java.nio.charset.StandardCharsets;
<<<<<<<
public class SimpleListConnection<T> implements DataFetcher<Connection<T>> {
=======
import static java.util.Base64.getDecoder;
import static java.util.Base64.getEncoder;
public class SimpleListConnection implements DataFetcher {
>>>>>>>
import static java.util.Base64.getDecoder;
import static java.util.Base64.getEncoder;
public class SimpleListConnection<T> implements DataFetcher<Connection<T>> {
<<<<<<<
if (cursor == null) {
return defaultValue;
}
String string = Base64.fromBase64(cursor);
=======
if (cursor == null) {
return defaultValue;
}
String string = new String(getDecoder().decode(cursor), StandardCharsets.UTF_8);
>>>>>>>
if (cursor == null) {
return defaultValue;
}
String string = new String(getDecoder().decode(cursor), StandardCharsets.UTF_8);
<<<<<<<
return Base64.toBase64(prefix + Integer.toString(offset));
=======
byte[] bytes = (prefix + Integer.toString(offset)).getBytes(StandardCharsets.UTF_8);
return getEncoder().encodeToString(bytes);
>>>>>>>
byte[] bytes = (prefix + Integer.toString(offset)).getBytes(StandardCharsets.UTF_8);
return getEncoder().encodeToString(bytes); |
<<<<<<<
import de.metas.uom.CreateUOMConversionRequest;
import de.metas.uom.IUOMDAO;
import de.metas.uom.UomId;
import org.adempiere.test.AdempiereTestHelper;
import org.compiere.model.I_M_Product;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
import static de.metas.esb.edi.model.I_EDI_DesadvLine.COLUMNNAME_QtyDeliveredInInvoiceUOM;
import static de.metas.esb.edi.model.I_EDI_DesadvLine.COLUMNNAME_QtyDeliveredInStockingUOM;
import static de.metas.esb.edi.model.I_EDI_DesadvLine.COLUMNNAME_QtyDeliveredInUOM;
import static de.metas.esb.edi.model.I_EDI_DesadvLine_Pack.COLUMNNAME_MovementQty;
import static de.metas.esb.edi.model.I_EDI_DesadvLine_Pack.COLUMNNAME_QtyCU;
import static de.metas.esb.edi.model.I_EDI_DesadvLine_Pack.COLUMNNAME_QtyCUsPerLU;
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.saveRecord;
import static org.assertj.core.api.Assertions.assertThat;
=======
import de.metas.uom.X12DE355;
>>>>>>>
import de.metas.uom.CreateUOMConversionRequest;
import de.metas.uom.IUOMDAO;
import de.metas.uom.UomId;
import org.adempiere.test.AdempiereTestHelper;
import org.compiere.model.I_M_Product;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
import static de.metas.esb.edi.model.I_EDI_DesadvLine.COLUMNNAME_QtyDeliveredInInvoiceUOM;
import static de.metas.esb.edi.model.I_EDI_DesadvLine.COLUMNNAME_QtyDeliveredInStockingUOM;
import static de.metas.esb.edi.model.I_EDI_DesadvLine.COLUMNNAME_QtyDeliveredInUOM;
import static de.metas.esb.edi.model.I_EDI_DesadvLine_Pack.COLUMNNAME_MovementQty;
import static de.metas.esb.edi.model.I_EDI_DesadvLine_Pack.COLUMNNAME_QtyCU;
import static de.metas.esb.edi.model.I_EDI_DesadvLine_Pack.COLUMNNAME_QtyCUsPerLU;
import static org.adempiere.model.InterfaceWrapperHelper.newInstance;
import static org.adempiere.model.InterfaceWrapperHelper.saveRecord;
import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
import org.adempiere.test.AdempiereTestHelper;
import org.compiere.model.I_C_UOM;
import org.compiere.model.I_M_Product;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import de.metas.business.BusinessTestHelper;
import de.metas.esb.edi.model.I_EDI_DesadvLine_Pack;
import de.metas.handlingunits.generichumodel.HURepository;
import de.metas.product.ProductId;
import de.metas.quantity.Quantity;
import de.metas.quantity.StockQtyAndUOMQty;
import de.metas.uom.IUOMDAO;
<<<<<<<
=======
final I_C_UOM coliUomRecord = BusinessTestHelper.createUOM("coli", X12DE355.COLI);
final I_C_UOM eachUomRecord = BusinessTestHelper.createUOM("each", X12DE355.EACH);
final I_M_Product productRecord = BusinessTestHelper.createProduct("product", eachUomRecord);
final ProductId productId = ProductId.ofRepoId(productRecord.getM_Product_ID());
>>>>>>> |
<<<<<<<
@NonNull final InvoiceHeaderImplBuilder invoiceHeader,
@NonNull final I_C_Invoice_Candidate icRecord,
@Nullable final InOutId inoutId)
=======
final InvoiceHeaderImplBuilder invoiceHeader,
final I_C_Invoice_Candidate icRecord,
final InOutId inoutId)
>>>>>>>
@NonNull final InvoiceHeaderImplBuilder invoiceHeader,
@NonNull final I_C_Invoice_Candidate icRecord,
@Nullable final InOutId inoutId)
<<<<<<<
final LocalDate dateInvoiced = computeDateInvoiced(icRecord);
logger.debug("Setting invoiceHeader's dateInvoiced={}", dateInvoiced);
invoiceHeader.setDateInvoiced(dateInvoiced);
final LocalDate dateAcct = computeDateAcct(icRecord);
logger.debug("Setting invoiceHeader's dateAcct={}", dateAcct);
invoiceHeader.setDateAcct(dateAcct);
=======
invoiceHeader.setDateInvoiced(computeDateInvoiced(icRecord));
invoiceHeader.setDateAcct(computeDateAcct(icRecord));
>>>>>>>
final LocalDate dateInvoiced = computeDateInvoiced(icRecord);
logger.debug("Setting invoiceHeader's dateInvoiced={}", dateInvoiced);
invoiceHeader.setDateInvoiced(dateInvoiced);
final LocalDate dateAcct = computeDateAcct(icRecord);
logger.debug("Setting invoiceHeader's dateAcct={}", dateAcct);
invoiceHeader.setDateAcct(dateAcct);
<<<<<<<
M_PriceList_ID = priceListDAO.getPriceListByPriceListVersionId(PriceListVersionId.ofRepoId(icRecord.getM_PriceList_Version_ID())).getM_PriceList_ID();
=======
M_PriceList_ID = priceListDAO.getPriceListByPriceListVersionId(PriceListVersionId.ofRepoId(icRecord.getM_PriceList_Version_ID())).getM_PriceList_ID();
>>>>>>>
M_PriceList_ID = priceListDAO.getPriceListByPriceListVersionId(PriceListVersionId.ofRepoId(icRecord.getM_PriceList_Version_ID())).getM_PriceList_ID();
<<<<<<<
() -> {
if (dateInvoicedParam != null)
logger.debug("computeDateInvoiced - returning aggregator's dateInvoicedParam={} as dateInvoiced", dateInvoicedParam);
return dateInvoicedParam;
},
() -> {
final LocalDate result = TimeUtil.asLocalDate(ic.getPresetDateInvoiced());
if (result != null)
logger.debug("computeDateInvoiced - returning ic's presetDateInvoiced={} as dateInvoiced", result);
return result;
},
() -> {
final LocalDate result = TimeUtil.asLocalDate(ic.getDateInvoiced());
if (result != null)
logger.debug("computeDateInvoiced - returning ic's dateInvoiced={} as dateInvoiced", result);
return result;
},
() -> {
logger.debug("computeDateInvoiced - returning aggregator's today={} as dateInvoiced", today);
return today;
});
=======
() -> TimeUtil.asLocalDate(ic.getPresetDateInvoiced()),
() -> TimeUtil.asLocalDate(ic.getDateInvoiced()),
() -> dateInvoicedParam,
() -> today);
>>>>>>>
() -> {
if (dateInvoicedParam != null)
logger.debug("computeDateInvoiced - returning aggregator's dateInvoicedParam={} as dateInvoiced", dateInvoicedParam);
return dateInvoicedParam;
},
() -> {
final LocalDate result = TimeUtil.asLocalDate(ic.getPresetDateInvoiced());
if (result != null)
logger.debug("computeDateInvoiced - returning ic's presetDateInvoiced={} as dateInvoiced", result);
return result;
},
() -> {
final LocalDate result = TimeUtil.asLocalDate(ic.getDateInvoiced());
if (result != null)
logger.debug("computeDateInvoiced - returning ic's dateInvoiced={} as dateInvoiced", result);
return result;
},
() -> {
logger.debug("computeDateInvoiced - returning aggregator's today={} as dateInvoiced", today);
return today;
});
<<<<<<<
() -> {
if (dateAcctParam != null)
logger.debug("computeDateAcct - returning aggregator's dateAcctParam={} as dateAcct", dateAcctParam);
return dateAcctParam;
},
() -> {
final LocalDate result = TimeUtil.asLocalDate(ic.getPresetDateInvoiced());
if (result != null)
logger.debug("computeDateAcct - returning ic's presetDateInvoiced={} as dateAcct", result);
return result;
},
() -> {
final LocalDate result = TimeUtil.asLocalDate(ic.getDateAcct());
if (result != null)
logger.debug("computeDateAcct - returning ic's dateAcct={} as dateAcct", result);
return result;
},
() -> {
logger.debug("computeDateAcct - falling back to aggregator's computeDateInvoiced as dateAcct");
return computeDateInvoiced(ic);
});
=======
() -> TimeUtil.asLocalDate(ic.getPresetDateInvoiced()),
() -> TimeUtil.asLocalDate(ic.getDateAcct()),
() -> dateAcctParam,
() -> computeDateInvoiced(ic));
>>>>>>>
() -> {
if (dateAcctParam != null)
logger.debug("computeDateAcct - returning aggregator's dateAcctParam={} as dateAcct", dateAcctParam);
return dateAcctParam;
},
() -> {
final LocalDate result = TimeUtil.asLocalDate(ic.getPresetDateInvoiced());
if (result != null)
logger.debug("computeDateAcct - returning ic's presetDateInvoiced={} as dateAcct", result);
return result;
},
() -> {
final LocalDate result = TimeUtil.asLocalDate(ic.getDateAcct());
if (result != null)
logger.debug("computeDateAcct - returning ic's dateAcct={} as dateAcct", result);
return result;
},
() -> {
logger.debug("computeDateAcct - falling back to aggregator's computeDateInvoiced as dateAcct");
return computeDateInvoiced(ic);
});
<<<<<<<
final BPartnerLocationId defaulBillLocationId = bpartnerDAO.retrieveCurrentBillLocationOrNull(bpartnerId);
if (defaulBillLocationId != null)
{
return defaulBillLocationId;
}
=======
final BPartnerLocationId defaulBillLocationId = bpartnerDAO.retrieveCurrentBillLocationOrNull(bpartnerId);
if (defaulBillLocationId != null)
{
return defaulBillLocationId;
}
>>>>>>>
final BPartnerLocationId defaulBillLocationId = bpartnerDAO.retrieveCurrentBillLocationOrNull(bpartnerId);
if (defaulBillLocationId != null)
{
return defaulBillLocationId;
}
<<<<<<<
final User defaultBillContact = bpartnerBL.retrieveContactOrNull(RetrieveContactRequest.builder()
.onlyActive(true)
.contactType(ContactType.BILL_TO_DEFAULT)
.bpartnerId(billBPLocationId.getBpartnerId())
.bPartnerLocationId(billBPLocationId)
.ifNotFound(IfNotFound.RETURN_NULL)
.build());
if(defaultBillContact != null)
{
return BPartnerContactId.ofRepoId(defaultBillContact.getBpartnerId(), defaultBillContact.getId().getRepoId());
}
=======
final User defaultBillContact = bpartnerBL.retrieveContactOrNull(RetrieveContactRequest.builder()
.onlyActive(true)
.contactType(ContactType.BILL_TO_DEFAULT)
.bpartnerId(billBPLocationId.getBpartnerId())
.bPartnerLocationId(billBPLocationId)
.ifNotFound(IfNotFound.RETURN_NULL)
.build());
if(defaultBillContact != null)
{
return BPartnerContactId.ofRepoId(defaultBillContact.getBpartnerId(), defaultBillContact.getId().getRepoId());
}
>>>>>>>
final User defaultBillContact = bpartnerBL.retrieveContactOrNull(RetrieveContactRequest.builder()
.onlyActive(true)
.contactType(ContactType.BILL_TO_DEFAULT)
.bpartnerId(billBPLocationId.getBpartnerId())
.bPartnerLocationId(billBPLocationId)
.ifNotFound(IfNotFound.RETURN_NULL)
.build());
if(defaultBillContact != null)
{
return BPartnerContactId.ofRepoId(defaultBillContact.getBpartnerId(), defaultBillContact.getId().getRepoId());
}
} |
<<<<<<<
import de.metas.rest_api.utils.MissingPropertyException;
import de.metas.rest_api.utils.MissingResourceException;
import de.metas.shipping.ShipperId;
=======
import de.metas.uom.IUOMDAO;
import de.metas.uom.UomId;
>>>>>>>
import de.metas.rest_api.utils.MissingPropertyException;
import de.metas.rest_api.utils.MissingResourceException;
import de.metas.shipping.ShipperId;
import de.metas.uom.IUOMDAO;
import de.metas.uom.UomId;
<<<<<<<
final String dataSourceIdentifier = request.getDataSource();
if (Check.isEmpty(dataSourceIdentifier))
{
throw new MissingPropertyException("dataSource", request);
}
final InputDataSourceId dataSourceId = masterdataProvider.getDataSourceId(dataSourceIdentifier);
final String dataDestIdentifier = request.getDataDest();
if (Check.isEmpty(dataDestIdentifier))
{
throw new MissingPropertyException("dataDest", request);
}
final InputDataSourceId dataDestId = masterdataProvider.getDataSourceId(dataDestIdentifier);
final ShipperId shipperId = masterdataProvider.getShipperId(request);
final BPartnerId salesRepId = masterdataProvider.getSalesRepId(request);
if (salesRepId == null)
{
throw MissingResourceException.builder().resourceName("salesPartnerCode").parentResource(request).build();
}
final PaymentRule paymentRule = masterdataProvider.getPaymentRule(request);
JsonPaymentInfo paymentInfo = request.getPaymentInfo();
=======
final UomId uomId;
if (!isEmpty(request.getUomCode(), true))
{
uomId = uomDAO.getUomIdByX12DE355(request.getUomCode());
}
else
{
uomId = productInfo.getUomId();
}
>>>>>>>
final String dataSourceIdentifier = request.getDataSource();
if (Check.isEmpty(dataSourceIdentifier))
{
throw new MissingPropertyException("dataSource", request);
}
final InputDataSourceId dataSourceId = masterdataProvider.getDataSourceId(dataSourceIdentifier);
final String dataDestIdentifier = request.getDataDest();
if (Check.isEmpty(dataDestIdentifier))
{
throw new MissingPropertyException("dataDest", request);
}
final InputDataSourceId dataDestId = masterdataProvider.getDataSourceId(dataDestIdentifier);
final ShipperId shipperId = masterdataProvider.getShipperId(request);
final BPartnerId salesRepId = masterdataProvider.getSalesRepId(request);
if (salesRepId == null)
{
throw MissingResourceException.builder().resourceName("salesPartnerCode").parentResource(request).build();
}
final PaymentRule paymentRule = masterdataProvider.getPaymentRule(request);
JsonPaymentInfo paymentInfo = request.getPaymentInfo();
final UomId uomId;
if (!isEmpty(request.getUomCode(), true))
{
uomId = uomDAO.getUomIdByX12DE355(request.getUomCode());
}
else
{
uomId = productInfo.getUomId();
} |
<<<<<<<
import org.slf4j.Logger;
import com.google.common.annotations.VisibleForTesting;
=======
import org.slf4j.Logger;
>>>>>>>
import org.slf4j.Logger;
import com.google.common.annotations.VisibleForTesting;
<<<<<<<
@VisibleForTesting
public void loadAndEvaluateESRImportStream(@NonNull final I_ESR_Import esrImport, @NonNull final InputStream in)
{
final IESRDataImporter loader = ESRDataLoaderFactory.createImporter(esrImport, in);
final ESRStatement esrStatement = loader.load();
esrImport.setESR_Control_Amount(esrStatement.getCtrlAmount());
esrImport.setESR_Control_Trx_Qty(esrStatement.getCtrlQty());
esrImport.setIsReceipt(true);
for (final String errorMsg : esrStatement.getErrorMsgs())
{
esrImport.setDescription(ESRDataLoaderUtil.addMsgToString(esrImport.getDescription(), errorMsg));
}
// TODO verify that the bankaccounts match!
InterfaceWrapperHelper.save(esrImport);
final List<ESRTransaction> transactions = esrStatement.getTransactions();
int lineNo = 0;
for (final ESRTransaction esrTransaction : transactions)
=======
int countLines = 0;
final ISysConfigBL sysConfigBL = Services.get(ISysConfigBL.class);
if (sysConfigBL.getBooleanValue(ESRConstants.SYSCONFIG_CHECK_DUPLICATED, false))
{
countLines = Services.get(IESRImportDAO.class).countLines(esrImport, null);
}
BufferedReader reader = null;
try
>>>>>>>
@VisibleForTesting
public void loadAndEvaluateESRImportStream(@NonNull final I_ESR_Import esrImport, @NonNull final InputStream in)
{
int countLines = 0;
final ISysConfigBL sysConfigBL = Services.get(ISysConfigBL.class);
if (sysConfigBL.getBooleanValue(ESRConstants.SYSCONFIG_CHECK_DUPLICATED, false))
{
countLines = Services.get(IESRImportDAO.class).countLines(esrImport, null);
}
final IESRDataImporter loader = ESRDataLoaderFactory.createImporter(esrImport, in);
final ESRStatement esrStatement = loader.load();
esrImport.setESR_Control_Amount(esrStatement.getCtrlAmount());
esrImport.setESR_Control_Trx_Qty(esrStatement.getCtrlQty());
esrImport.setIsReceipt(true);
for (final String errorMsg : esrStatement.getErrorMsgs())
{
esrImport.setDescription(ESRDataLoaderUtil.addMsgToString(esrImport.getDescription(), errorMsg));
}
// TODO verify that the bankaccounts match!
InterfaceWrapperHelper.save(esrImport);
final List<ESRTransaction> transactions = esrStatement.getTransactions();
int lineNo = 0;
for (final ESRTransaction esrTransaction : transactions)
<<<<<<<
evaluate(esrImport);
}
private void evaluate(final I_ESR_Import esrImport)
{
BigDecimal importAmt = BigDecimal.ZERO;
int trxQty = 0;
=======
//
// create line only if does not exist
I_ESR_ImportLine existentLine = null;
// if there are already lines before starting reading the file, means that we already tried to import once
if (countLines > 0)
{
existentLine = Services.get(IESRImportDAO.class).fetchLineForESRLineText(esrImport, currentTextLine);
}
if (existentLine == null)
{
final I_ESR_ImportLine line = createESRImportLine(esrImport, currentTextLine, lineNo, trxRunConfig);
if (isControlLine(line))
{
// The control lines do not contain relevant information about the bank account
continue;
}
else
{
importAmt = importAmt.add(line.getAmount());
trxQty++;
}
}
}
>>>>>>>
evaluate(esrImport);
}
private void evaluate(final I_ESR_Import esrImport)
{
BigDecimal importAmt = BigDecimal.ZERO;
int trxQty = 0;
<<<<<<<
final List<I_ESR_ImportLine> linesToProcess = new ArrayList<>();
=======
final List<I_ESR_ImportLine> linesToProcess = new ArrayList<I_ESR_ImportLine>();
final List<I_ESR_ImportLine> allLines = Services.get(IESRImportDAO.class).retrieveLines(esrImport);
>>>>>>>
final List<I_ESR_ImportLine> linesToProcess = new ArrayList<>();
final List<I_ESR_ImportLine> allLines = Services.get(IESRImportDAO.class).retrieveLines(esrImport);
<<<<<<<
// @Override
// public boolean isControlLine(final I_ESR_ImportLine line)
// {
// final String trxType = line.getESRTrxType();
// return ESRConstants.ESRTRXTYPE_Payment.equals(trxType)
// || ESRConstants.ESRTRXTYPE_Receipt.equals(trxType);
// }
=======
@Override
public void addErrorMsg(I_ESR_ImportLine importLine, String msg)
{
if (Check.isEmpty(msg, true))
{
return;
}
String errorMsg = importLine.getErrorMsg();
if (errorMsg == null)
{
errorMsg = "";
}
if (!Check.isEmpty(errorMsg, true))
{
errorMsg += "; ";
}
errorMsg += msg;
importLine.setErrorMsg(errorMsg);
}
@Override
public void addErrorMsgInFront(I_ESR_ImportLine importLine, String msg)
{
if (Check.isEmpty(msg, true))
{
return;
}
String errorMsg = importLine.getErrorMsg();
if (errorMsg == null)
{
errorMsg = "";
}
final StringBuffer err = new StringBuffer();
err.append(msg);
if (!Check.isEmpty(errorMsg, true))
{
err.append("; ");
}
err.append(errorMsg);
importLine.setErrorMsg(err.toString());
}
private boolean isControlLine(final I_ESR_ImportLine line)
{
final String trxType = line.getESRTrxType();
return ESRConstants.ESRTRXTYPE_Payment.equals(trxType)
|| ESRConstants.ESRTRXTYPE_Receipt.equals(trxType);
}
>>>>>>>
// @Override
// public boolean isControlLine(final I_ESR_ImportLine line)
// {
// final String trxType = line.getESRTrxType();
// return ESRConstants.ESRTRXTYPE_Payment.equals(trxType)
// || ESRConstants.ESRTRXTYPE_Receipt.equals(trxType);
// }
@Override
public void addErrorMsgInFront(I_ESR_ImportLine importLine, String msg)
{
if (Check.isEmpty(msg, true))
{
return;
}
String errorMsg = importLine.getErrorMsg();
if (errorMsg == null)
{
errorMsg = "";
}
final StringBuffer err = new StringBuffer();
err.append(msg);
if (!Check.isEmpty(errorMsg, true))
{
err.append("; ");
}
err.append(errorMsg);
importLine.setErrorMsg(err.toString());
} |
<<<<<<<
import org.adempiere.util.Check;
import org.adempiere.util.Services;
=======
>>>>>>>
import org.adempiere.util.Check;
import org.adempiere.util.Services;
<<<<<<<
Services.get(IShipmentSchedulePA.class).deleteUnprocessedLocksForShipmentRun(0, Env.getAD_User_ID(Env.getCtx()), null);
=======
>>>>>>> |
<<<<<<<
/** Just Prepared Flag */
private boolean m_justPrepared = false;
=======
/**
* Create & Complete Cost Collector
*
* @param order
* @param M_Product_ID
* @param M_Locator_ID
* @param M_AttributeSetInstance_ID
* @param S_Resource_ID
* @param PP_Order_BOMLine_ID
* @param PP_Order_Node_ID
* @param docTypeId
* @param CostCollectorType
* @param movementdate
* @param qty
* @param scrap
* @param reject
* @param durationSetup
* @param duration
* @param trxName
* @return completed cost collector
*/
public static I_PP_Cost_Collector createCollector(
final I_PP_Order order,
final int M_Product_ID,
final int M_Locator_ID,
final int M_AttributeSetInstance_ID,
final int S_Resource_ID,
final int PP_Order_BOMLine_ID,
final int PP_Order_Node_ID,
final int docTypeId,
final String CostCollectorType,
final Timestamp movementdate,
final BigDecimal qty,
final BigDecimal scrap,
final BigDecimal reject,
final int durationSetup,
final BigDecimal duration
)
{
final IContextAware context = InterfaceWrapperHelper.getContextAware(order);
return createCollector(context, order, M_Product_ID, M_Locator_ID, M_AttributeSetInstance_ID, S_Resource_ID, PP_Order_BOMLine_ID, PP_Order_Node_ID, docTypeId, CostCollectorType, movementdate,
qty, scrap, reject, durationSetup, duration);
}
/**
* Create & Complete Cost Collector
*
* @param context
* @param order
* @param M_Product_ID
* @param M_Locator_ID
* @param M_AttributeSetInstance_ID
* @param S_Resource_ID
* @param PP_Order_BOMLine_ID
* @param PP_Order_Node_ID
* @param docTypeId
* @param CostCollectorType
* @param movementdate
* @param qty
* @param scrap
* @param reject
* @param durationSetup
* @param duration
* @return
*/
public static I_PP_Cost_Collector createCollector(
final IContextAware context,
final I_PP_Order order,
final int M_Product_ID,
final int M_Locator_ID,
final int M_AttributeSetInstance_ID,
final int S_Resource_ID,
final int PP_Order_BOMLine_ID,
final int PP_Order_Node_ID,
final int docTypeId,
final String CostCollectorType,
final Timestamp movementdate,
final BigDecimal qty,
final BigDecimal scrap,
final BigDecimal reject,
final int durationSetup,
final BigDecimal duration
)
{
// FIXME: make sure we are running in trasaction
final int docTypeId_ToUse;
if (docTypeId > 0)
{
docTypeId_ToUse = docTypeId;
}
else
{
docTypeId_ToUse = MDocType.getDocType(MDocType.DOCBASETYPE_ManufacturingCostCollector);
}
final I_PP_Cost_Collector cc = InterfaceWrapperHelper.newInstance(I_PP_Cost_Collector.class, context);
setPP_Order(cc, order);
cc.setPP_Order_BOMLine_ID(PP_Order_BOMLine_ID);
cc.setPP_Order_Node_ID(PP_Order_Node_ID);
cc.setC_DocType_ID(docTypeId_ToUse);
cc.setC_DocTypeTarget_ID(docTypeId_ToUse);
cc.setCostCollectorType(CostCollectorType);
cc.setDocAction(MPPCostCollector.DOCACTION_Complete);
cc.setDocStatus(MPPCostCollector.DOCSTATUS_Drafted);
cc.setIsActive(true);
cc.setM_Locator_ID(M_Locator_ID);
cc.setM_AttributeSetInstance_ID(M_AttributeSetInstance_ID);
cc.setS_Resource_ID(S_Resource_ID);
cc.setMovementDate(movementdate);
cc.setDateAcct(movementdate);
cc.setMovementQty(qty);
cc.setScrappedQty(scrap);
cc.setQtyReject(reject);
cc.setSetupTimeReal(new BigDecimal(durationSetup));
cc.setDurationReal(duration);
cc.setPosted(false);
cc.setProcessed(false);
cc.setProcessing(false);
cc.setUser1_ID(order.getUser1_ID());
cc.setUser2_ID(order.getUser2_ID());
cc.setM_Product_ID(M_Product_ID);
if (PP_Order_Node_ID > 0)
{
setIsSubcontracting(cc, PP_Order_Node_ID);
}
// If this is an material issue, we should use BOM Line's UOM
if (PP_Order_BOMLine_ID > 0)
{
cc.setC_UOM(null); // we set the BOM Line UOM on beforeSave
}
InterfaceWrapperHelper.save(cc);
//
// Process the Cost Collector
Services.get(IDocumentBL.class).processEx(cc,
X_PP_Cost_Collector.DOCACTION_Complete,
null // expectedDocStatus
);
return cc;
}
public static void setPP_Order(final I_PP_Cost_Collector cc, final I_PP_Order order)
{
final I_PP_Order_Workflow ppOrderWorkflow = Services.get(IPPOrderBL.class).getPP_Order_Workflow(order);
cc.setPP_Order(order);
cc.setPP_Order_Workflow(ppOrderWorkflow);
cc.setAD_Org_ID(order.getAD_Org_ID());
cc.setM_Warehouse_ID(order.getM_Warehouse_ID());
cc.setAD_OrgTrx_ID(order.getAD_OrgTrx_ID());
cc.setC_Activity_ID(order.getC_Activity_ID());
cc.setC_Campaign_ID(order.getC_Campaign_ID());
cc.setC_Project_ID(order.getC_Project_ID());
cc.setDescription(order.getDescription());
cc.setS_Resource_ID(order.getS_Resource_ID());
cc.setM_Product_ID(order.getM_Product_ID());
cc.setC_UOM_ID(order.getC_UOM_ID());
cc.setM_AttributeSetInstance_ID(order.getM_AttributeSetInstance_ID());
cc.setMovementQty(order.getQtyOrdered());
}
>>>>>>>
/** Just Prepared Flag */
private boolean m_justPrepared = false;
<<<<<<<
=======
setDescription(description);
else
setDescription(desc + " | " + description);
} // addDescription
public void setC_DocTypeTarget_ID(String docBaseType)
{
final MDocType[] doc = MDocType.getOfDocBaseType(getCtx(), docBaseType);
if (doc == null)
>>>>>>>
<<<<<<<
DB.executeUpdateEx(sql, new Object[] { processed, get_ID() }, get_TrxName());
}
=======
final int noLine = DB.executeUpdateEx(sql, new Object[] { processed, get_ID() }, get_TrxName());
log.debug("setProcessed - " + processed + " - Lines=" + noLine);
} // setProcessed
>>>>>>>
DB.executeUpdateEx(sql, new Object[] { processed, get_ID() }, get_TrxName());
}
<<<<<<<
final MPPOrderNode activity = getPP_Order_Node();
if (X_PP_Order_Node.DOCACTION_Complete.equals(activity.getDocStatus()))
=======
final MPPOrderNode activity = getPP_Order_Node();
if (MPPOrderNode.DOCACTION_Complete.equals(activity.getDocStatus()))
>>>>>>>
final MPPOrderNode activity = getPP_Order_Node();
if (X_PP_Order_Node.DOCACTION_Complete.equals(activity.getDocStatus()))
<<<<<<<
final I_M_Product product = getM_Product();
if (getM_AttributeSetInstance_ID() <= 0 && Services.get(IProductBL.class).isASIMandatory(product, false))
=======
final MProduct product = getM_Product();
if (getM_AttributeSetInstance_ID() == 0 && product.isASIMandatory(false))
>>>>>>>
final I_M_Product product = getM_Product();
if (getM_AttributeSetInstance_ID() <= 0 && Services.get(IProductBL.class).isASIMandatory(product, false))
<<<<<<<
final I_M_Product product = getM_Product();
if (getM_AttributeSetInstance_ID() <= 0 && Services.get(IProductBL.class).isASIMandatory(product, true))
=======
final MProduct product = getM_Product();
if (getM_AttributeSetInstance_ID() == 0 && product.isASIMandatory(true))
>>>>>>>
final I_M_Product product = getM_Product();
if (getM_AttributeSetInstance_ID() <= 0 && Services.get(IProductBL.class).isASIMandatory(product, true))
<<<<<<<
final String docStatus = X_PP_Order_Node.DOCSTATUS_Completed;
// final StringBuffer msg = new StringBuffer("The quantity do not is complete for next Purchase Order : ");
=======
final String DocStatus = MPPOrderNode.DOCSTATUS_Completed;
final StringBuffer msg = new StringBuffer("The quantity do not is complete for next Purchase Order : ");
>>>>>>>
final String docStatus = X_PP_Order_Node.DOCSTATUS_Completed;
// final StringBuffer msg = new StringBuffer("The quantity do not is complete for next Purchase Order : ");
<<<<<<<
ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_REVERSECORRECT);
=======
// Fire: AFTER_REVERSECORRECT
{
m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_REVERSECORRECT);
if (m_processMsg != null)
return false;
}
>>>>>>>
ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_REVERSECORRECT);
<<<<<<<
catch (final Exception ex)
=======
catch (final Exception e)
>>>>>>>
catch (final Exception ex)
<<<<<<<
// String msg = "";
final Map<Integer, MOrder> orders = new HashMap<>();
=======
String msg = "";
final HashMap<Integer, MOrder> orders = new HashMap<>();
>>>>>>>
// String msg = "";
final Map<Integer, MOrder> orders = new HashMap<>();
<<<<<<<
final I_M_Product product = MProduct.get(getCtx(), subcontract.getM_Product_ID());
if (!product.isPurchased() || !X_M_Product.PRODUCTTYPE_Service.equals(product.getProductType()))
{
=======
final MProduct product = MProduct.get(getCtx(), subcontract.getM_Product_ID());
if (!product.isPurchased() || !MProduct.PRODUCTTYPE_Service.equals(product.getProductType()))
>>>>>>>
final I_M_Product product = MProduct.get(getCtx(), subcontract.getM_Product_ID());
if (!product.isPurchased() || !X_M_Product.PRODUCTTYPE_Service.equals(product.getProductType()))
{
<<<<<<<
// FRESH-334: Make sure the BP_Product if of the product's org or org *
=======
//FRESH-334: Make sure the BP_Product if of the product's org or org *
>>>>>>>
// FRESH-334: Make sure the BP_Product if of the product's org or org *
<<<<<<<
final MOrderLine orderLine = new MOrderLine(order);
orderLine.setM_Product_ID(product.getM_Product_ID());
orderLine.setDescription(activity.getDescription());
orderLine.setM_Warehouse_ID(getM_Warehouse_ID());
orderLine.setQty(QtyOrdered);
=======
final MOrderLine oline = new MOrderLine(order);
oline.setM_Product_ID(product.getM_Product_ID());
oline.setDescription(activity.getDescription());
oline.setM_Warehouse_ID(getM_Warehouse_ID());
oline.setQty(QtyOrdered);
>>>>>>>
final MOrderLine orderLine = new MOrderLine(order);
orderLine.setM_Product_ID(product.getM_Product_ID());
orderLine.setDescription(activity.getDescription());
orderLine.setM_Warehouse_ID(getM_Warehouse_ID());
orderLine.setQty(QtyOrdered);
<<<<<<<
{
return X_M_Transaction.MOVEMENTTYPE_WorkOrder_;
}
=======
return MTransaction.MOVEMENTTYPE_WorkOrderMinus;
>>>>>>>
{
return MTransaction.MOVEMENTTYPE_WorkOrderMinus;
}
<<<<<<<
}
=======
public boolean isFloorStock()
{
final String whereClause = I_PP_Order_BOMLine.COLUMNNAME_PP_Order_BOMLine_ID + "=?"
+ " AND " + I_PP_Order_BOMLine.COLUMNNAME_IssueMethod + "=?";
final boolean isFloorStock = new Query(getCtx(), I_PP_Order_BOMLine.Table_Name, whereClause, get_TrxName())
.setOnlyActiveRecords(true)
.setParameters(new Object[] { getPP_Order_BOMLine_ID(), X_PP_Order_BOMLine.ISSUEMETHOD_FloorStock })
.match();
return isFloorStock;
}
/**
* set Is SubContracting
*
* @param PP_Order_Node_ID
**/
private static void setIsSubcontracting(final I_PP_Cost_Collector cc, int PP_Order_Node_ID)
{
final Properties ctx = InterfaceWrapperHelper.getCtx(cc);
final String trxName = InterfaceWrapperHelper.getTrxName(cc);
final MPPOrderNode ppOrderNode = MPPOrderNode.get(ctx, PP_Order_Node_ID, trxName);
final boolean subcontracting = ppOrderNode.isSubcontracting();
cc.setIsSubcontracting(subcontracting);
}
} // MPPCostCollector
>>>>>>>
} |
<<<<<<<
import de.metas.currency.CurrencyCode;
=======
import de.metas.common.rest_api.payment.JsonInboundPaymentInfo;
>>>>>>>
import de.metas.common.rest_api.payment.JsonInboundPaymentInfo;
import de.metas.currency.CurrencyCode;
<<<<<<<
public static final CurrencyCode CURRENCY_CODE_EUR = CurrencyCode.EUR;
public static final BigDecimal PAYMENT_AMOUNT = BigDecimal.valueOf(123.456);
=======
public static final String CURRENCY_CODE_EUR = "EUR";
>>>>>>>
public static final CurrencyCode CURRENCY_CODE_EUR = CurrencyCode.EUR;
<<<<<<<
.currencyCode(CURRENCY_CODE_EUR.toThreeLetterCode())
.amount(PAYMENT_AMOUNT)
=======
.currencyCode(CURRENCY_CODE_EUR)
.externalPaymentId(EXTERNAL_ID)
>>>>>>>
.currencyCode(CURRENCY_CODE_EUR.toThreeLetterCode())
.externalPaymentId(EXTERNAL_ID)
<<<<<<<
.orgCode(AD_Org_Value)
.externalOrderId("Order")
.bpartnerIdentifier("ext-bPartner")
.currencyCode(CURRENCY_CODE_EUR.toThreeLetterCode())
.amount(PAYMENT_AMOUNT)
.targetIBAN(TARGET_IBAN)
.build(),
=======
.orgCode(AD_Org_Value)
.orderIdentifier("ext-Order")
.bpartnerIdentifier("ext-bPartner")
.currencyCode(CURRENCY_CODE_EUR)
.targetIBAN(TARGET_IBAN)
.externalPaymentId(EXTERNAL_ID)
.build(),
>>>>>>>
.orgCode(AD_Org_Value)
.orderIdentifier("ext-Order")
.bpartnerIdentifier("ext-bPartner")
.currencyCode(CURRENCY_CODE_EUR.toThreeLetterCode())
.targetIBAN(TARGET_IBAN)
.externalPaymentId(EXTERNAL_ID)
.build(), |
<<<<<<<
.rows(rows)
.pickingCandidateCommand(pickingCandidateCommand)
=======
.rowsSupplier(rowsSupplier)
>>>>>>>
.rowsSupplier(rowsSupplier)
.pickingCandidateCommand(pickingCandidateCommand) |
<<<<<<<
import org.adempiere.util.Check;
import org.adempiere.util.Services;
=======
import org.compiere.model.I_M_Product;
>>>>>>>
<<<<<<<
import de.metas.product.ProductId;
=======
import de.metas.util.Check;
import de.metas.util.Services;
>>>>>>>
import de.metas.product.ProductId;
import de.metas.util.Check;
import de.metas.util.Services; |
<<<<<<<
=======
import de.metas.document.references.zoom_into.RecordWindowFinder;
>>>>>>>
import de.metas.document.references.zoom_into.RecordWindowFinder;
<<<<<<<
=======
private void openOrder(@NonNull final I_C_Order order)
{
final AdWindowId orderWindowId = RecordWindowFinder
.findAdWindowId(TableRecordReference.of(order))
.orElse(null);
if (orderWindowId == null)
{
log.warn("Skip opening {} because no window found for it", order);
return;
}
getResult().setRecordToOpen(
TableRecordReference.of(order),
orderWindowId.getRepoId(),
ProcessExecutionResult.RecordsToOpen.OpenTarget.SingleDocument,
ProcessExecutionResult.RecordsToOpen.TargetTab.SAME_TAB);
}
>>>>>>>
private void openOrder(@NonNull final I_C_Order order)
{
final AdWindowId orderWindowId = RecordWindowFinder
.findAdWindowId(TableRecordReference.of(order))
.orElse(null);
if (orderWindowId == null)
{
log.warn("Skip opening {} because no window found for it", order);
return;
}
getResult().setRecordToOpen(
TableRecordReference.of(order),
orderWindowId.getRepoId(),
ProcessExecutionResult.RecordsToOpen.OpenTarget.SingleDocument,
ProcessExecutionResult.RecordsToOpen.TargetTab.SAME_TAB);
} |
<<<<<<<
import de.metas.util.Check;
import de.metas.util.Services;
=======
import com.google.common.collect.ImmutableSet;
import de.metas.user.UserId;
import de.metas.util.Check;
import de.metas.util.Services;
>>>>>>>
import com.google.common.collect.ImmutableSet;
import de.metas.user.UserId;
import de.metas.util.Check;
import de.metas.util.Services;
<<<<<<<
import org.adempiere.ad.dao.QueryLimit;
=======
import org.adempiere.ad.dao.IQueryFilter;
import org.adempiere.ad.dao.IQueryOrderBy.Direction;
import org.adempiere.ad.dao.IQueryOrderBy.Nulls;
>>>>>>>
import org.adempiere.ad.dao.IQueryFilter;
import org.adempiere.ad.dao.QueryLimit;
<<<<<<<
import org.adempiere.exceptions.AdempiereException;
=======
import org.adempiere.archive.api.IArchiveEventManager;
>>>>>>>
import org.adempiere.archive.api.IArchiveEventManager;
<<<<<<<
import org.adempiere.util.lang.impl.TableRecordReference;
=======
import org.adempiere.util.lang.ITableRecordReference;
import org.adempiere.util.lang.impl.TableRecordReference;
>>>>>>>
import org.adempiere.util.lang.impl.TableRecordReference;
import org.adempiere.util.lang.impl.TableRecordReference;
<<<<<<<
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import static org.adempiere.model.InterfaceWrapperHelper.loadOutOfTrx;
=======
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.function.Function;
import java.util.stream.Stream;
>>>>>>>
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.function.Function;
import java.util.stream.Stream;
<<<<<<<
=======
@Override
public <T> Stream<AdArchive> streamArchivesForFilter(@NonNull final IQueryFilter<T> outboundLogFilter, final Class<T> objectClass)
{
final IQueryBuilder<T> queryBuilder = queryBL.createQueryBuilder(objectClass)
.addOnlyActiveRecordsFilter().filter(outboundLogFilter);
return queryBuilder.create()
.iterateAndStream()
.map(log -> retrieveLastArchives(Env.getCtx(), TableRecordReference.ofReferenced(log), 1).stream().findFirst())
.filter(Optional::isPresent)
.map(Optional::get)
.map(arch -> AdArchive.builder().id(ArchiveId.ofRepoId(arch.getAD_Archive_ID())).archiveData(archiveBL.getBinaryData(arch)).build());
}
@Override
public void updatePrintedRecords(final ImmutableSet<ArchiveId> ids, final UserId userId)
{
queryBL.createQueryBuilder(I_AD_Archive.class, Env.getCtx(), ITrx.TRXNAME_None)
.addOnlyActiveRecordsFilter()
.addInArrayFilter(I_AD_Archive.COLUMN_AD_Archive_ID, ids).create().iterateAndStream().filter(Objects::nonNull).forEach(archive -> archiveEventManager.firePdfUpdate(archive, userId));
}
>>>>>>> |
<<<<<<<
import org.adempiere.util.Services;
import org.compiere.model.I_C_BPartner;
import org.compiere.model.I_C_BPartner_Location;
=======
>>>>>>>
import org.compiere.model.I_C_BPartner;
import org.compiere.model.I_C_BPartner_Location; |
<<<<<<<
/**
* This class is the developers' entrypoint to using <code>model</code> instances of different types.
* It internally relates on a {@link CompositeInterfaceWrapperHelper} which in turn supports all the types that are supported by this class.
*
* @author metas-dev <[email protected]>
*
*/
=======
/**
* This class is heavily used throughout metasfresh. To understand what it's all about see the javadoc of {@link #create(Object, Class)}.
*
* @author metas-dev <[email protected]>
*
*/
>>>>>>>
/**
* This class is heavily used throughout metasfresh. To understand what it's all about see the javadoc of {@link #create(Object, Class)}.
* It internally relates on a {@link CompositeInterfaceWrapperHelper} which in turn supports all the types that are supported by this class.
*
* @author metas-dev <[email protected]>
*
*/ |
<<<<<<<
import org.adempiere.util.Check;
import org.adempiere.util.Services;
=======
>>>>>>>
<<<<<<<
import de.metas.product.IProductBL;
import de.metas.product.ProductId;
=======
import de.metas.util.Check;
>>>>>>>
import de.metas.product.IProductBL;
import de.metas.product.ProductId;
import de.metas.util.Check;
import de.metas.util.Services; |
<<<<<<<
import org.adempiere.util.Services;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseDAO;
=======
>>>>>>>
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseDAO; |
<<<<<<<
import de.metas.payment.TenderType;
=======
import de.metas.organization.IOrgDAO;
import de.metas.payment.api.DefaultPaymentBuilder.TenderType;
>>>>>>>
import de.metas.organization.IOrgDAO;
import de.metas.payment.TenderType; |
<<<<<<<
import de.metas.costing.CostAmount;
=======
import de.metas.bpartner.service.IBPartnerDAO;
>>>>>>>
import de.metas.bpartner.service.IBPartnerDAO;
import de.metas.costing.CostAmount;
<<<<<<<
public CostAmount getCostPrice(final org.compiere.model.I_C_OrderLine orderLine)
{
final int currencyId = orderLine.getC_Currency_ID();
final BigDecimal poCostPrice = orderLine.getPriceCost();
if (poCostPrice != null && poCostPrice.signum() != 0)
{
return CostAmount.of(poCostPrice, currencyId);
}
BigDecimal priceActual = orderLine.getPriceActual();
if (!isTaxIncluded(orderLine))
{
return CostAmount.of(priceActual, currencyId);
}
final int taxId = orderLine.getC_Tax_ID();
if (taxId <= 0)
{
// shall not happen
return CostAmount.of(priceActual, currencyId);
}
final MTax tax = MTax.get(Env.getCtx(), taxId);
if (tax.isZeroTax())
{
return CostAmount.of(priceActual, currencyId);
}
final int stdPrecision = getPrecision(orderLine);
final BigDecimal taxAmt = Services.get(ITaxBL.class).calculateTax(tax, priceActual, true/* taxIncluded */, stdPrecision);
final BigDecimal priceActualWithoutTax = priceActual.subtract(taxAmt);
return CostAmount.of(priceActualWithoutTax, currencyId);
}
@Override
public void updateNoPriceConditionsColor(final I_C_OrderLine orderLine)
=======
public int getC_PaymentTerm_ID(@NonNull final org.compiere.model.I_C_OrderLine orderLine)
>>>>>>>
public CostAmount getCostPrice(final org.compiere.model.I_C_OrderLine orderLine)
{
final int currencyId = orderLine.getC_Currency_ID();
final BigDecimal poCostPrice = orderLine.getPriceCost();
if (poCostPrice != null && poCostPrice.signum() != 0)
{
return CostAmount.of(poCostPrice, currencyId);
}
BigDecimal priceActual = orderLine.getPriceActual();
if (!isTaxIncluded(orderLine))
{
return CostAmount.of(priceActual, currencyId);
}
final int taxId = orderLine.getC_Tax_ID();
if (taxId <= 0)
{
// shall not happen
return CostAmount.of(priceActual, currencyId);
}
final MTax tax = MTax.get(Env.getCtx(), taxId);
if (tax.isZeroTax())
{
return CostAmount.of(priceActual, currencyId);
}
final int stdPrecision = getPrecision(orderLine);
final BigDecimal taxAmt = Services.get(ITaxBL.class).calculateTax(tax, priceActual, true/* taxIncluded */, stdPrecision);
final BigDecimal priceActualWithoutTax = priceActual.subtract(taxAmt);
return CostAmount.of(priceActualWithoutTax, currencyId);
}
@Override
public int getC_PaymentTerm_ID(@NonNull final org.compiere.model.I_C_OrderLine orderLine) |
<<<<<<<
int retrieveOrgIdByLocatorId(int locatorId);
=======
int retrieveLocatorIdByValueAndWarehouseId(String locatorvalue, int warehouseId);
>>>>>>>
int retrieveOrgIdByLocatorId(int locatorId);
int retrieveLocatorIdByValueAndWarehouseId(String locatorvalue, int warehouseId); |
<<<<<<<
import org.adempiere.service.OrgId;
import org.adempiere.util.Services;
import org.adempiere.warehouse.WarehouseId;
=======
>>>>>>>
import org.adempiere.service.OrgId;
import org.adempiere.warehouse.WarehouseId; |
<<<<<<<
import org.slf4j.Logger;
import org.slf4j.Logger;
=======
import org.compiere.util.Ini;
import org.compiere.util.Trx;
import org.slf4j.Logger;
import org.slf4j.Logger;
>>>>>>>
import org.slf4j.Logger; |
<<<<<<<
import org.apache.storm.task.OutputCollector;
=======
>>>>>>>
import org.apache.storm.task.OutputCollector; |
<<<<<<<
import com.digitalpebble.stormcrawler.elasticsearch.persistence.CollapsingSpout;
=======
import com.digitalpebble.stormcrawler.elasticsearch.metrics.StatusMetricsBolt;
import com.digitalpebble.stormcrawler.elasticsearch.persistence.ElasticSearchSpout;
>>>>>>>
import com.digitalpebble.stormcrawler.elasticsearch.persistence.CollapsingSpout;
import com.digitalpebble.stormcrawler.elasticsearch.metrics.StatusMetricsBolt; |
<<<<<<<
import org.compiere.util.Env;
=======
import org.compiere.util.TimeUtil;
>>>>>>>
import org.compiere.util.Env;
import org.compiere.util.TimeUtil; |
<<<<<<<
private static final long serialVersionUID = 280932628L;
=======
private static final long serialVersionUID = 1394461433L;
>>>>>>>
private static final long serialVersionUID = 1657479232L;
<<<<<<<
setIsPickingOrder (false); // N
setM_Product_ID (0);
=======
>>>>>>>
setIsPickingOrder (false); // N
<<<<<<<
public void setIsTraded (java.lang.String IsTraded)
{
set_Value (COLUMNNAME_IsTraded, IsTraded);
}
/** Get Wird gehandelt (Bestellkontrolle).
@return Legt fest, ob mit dem bestreffenden Produkt gehandelt wird.
*/
@Override
public java.lang.String getIsTraded ()
{
return (java.lang.String)get_Value(COLUMNNAME_IsTraded);
}
@Override
public org.compiere.model.I_M_AttributeSetInstance getM_AttributeSetInstance()
=======
public org.compiere.model.I_M_AttributeSetInstance getM_AttributeSetInstance()
>>>>>>>
public void setIsTraded (java.lang.String IsTraded)
{
set_Value (COLUMNNAME_IsTraded, IsTraded);
}
/** Get Wird gehandelt (Bestellkontrolle).
@return Legt fest, ob mit dem bestreffenden Produkt gehandelt wird.
*/
@Override
public java.lang.String getIsTraded ()
{
return (java.lang.String)get_Value(COLUMNNAME_IsTraded);
}
@Override
public org.compiere.model.I_M_AttributeSetInstance getM_AttributeSetInstance() |
<<<<<<<
import de.metas.rest_api.invoicecandidates.request.JsonRequestEnqueueForInvoicing;
import de.metas.rest_api.invoicecandidates.request.JsonRequestInvoiceCandidateUpsert;
import de.metas.rest_api.invoicecandidates.response.JsonResponseEnqueueForInvoicing;
import de.metas.rest_api.invoicecandidates.response.JsonResponseInvoiceCandidateUpsert;
import de.metas.util.web.MetasfreshRestAPIConstants;
=======
import de.metas.rest_api.invoicecandidates.request.JsonEnqueueForInvoicingRequest;
import de.metas.rest_api.invoicecandidates.request.JsonGetInvoiceCandidatesStatusRequest;
import de.metas.rest_api.invoicecandidates.response.JsonEnqueueForInvoicingResponse;
import de.metas.rest_api.invoicecandidates.response.JsonGetInvoiceCandidatesStatusResponse;
import de.metas.util.rest.MetasfreshRestAPIConstants;
>>>>>>>
import de.metas.rest_api.invoicecandidates.request.JsonEnqueueForInvoicingRequest;
import de.metas.rest_api.invoicecandidates.request.JsonGetInvoiceCandidatesStatusRequest;
import de.metas.rest_api.invoicecandidates.request.JsonRequestInvoiceCandidateUpsert;
import de.metas.rest_api.invoicecandidates.response.JsonEnqueueForInvoicingResponse;
import de.metas.rest_api.invoicecandidates.response.JsonGetInvoiceCandidatesStatusResponse;
import de.metas.rest_api.invoicecandidates.response.JsonResponseInvoiceCandidateUpsert;
import de.metas.util.web.MetasfreshRestAPIConstants;
<<<<<<<
ResponseEntity<JsonResponseInvoiceCandidateUpsert> createOrUpdateInvoiceCandidates(JsonRequestInvoiceCandidateUpsert request);
ResponseEntity<JsonResponseEnqueueForInvoicing> enqueueForInvoicing(JsonRequestEnqueueForInvoicing request);
=======
ResponseEntity<JsonEnqueueForInvoicingResponse> enqueueForInvoicing(JsonEnqueueForInvoicingRequest request);
ResponseEntity<JsonGetInvoiceCandidatesStatusResponse> checkInvoiceCandidatesStatus(JsonGetInvoiceCandidatesStatusRequest request);
>>>>>>>
ResponseEntity<JsonResponseInvoiceCandidateUpsert> createOrUpdateInvoiceCandidates(JsonRequestInvoiceCandidateUpsert request);
ResponseEntity<JsonEnqueueForInvoicingResponse> enqueueForInvoicing(JsonEnqueueForInvoicingRequest request);
ResponseEntity<JsonGetInvoiceCandidatesStatusResponse> checkInvoiceCandidatesStatus(JsonGetInvoiceCandidatesStatusRequest request); |
<<<<<<<
import java.util.Collection;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import org.adempiere.exceptions.AdempiereException;
import org.compiere.model.I_AD_User;
import org.compiere.model.I_C_BPartner;
import org.compiere.model.I_C_BPartner_Location;
=======
>>>>>>>
<<<<<<<
@NonNull final Collection<BPartnerCompositeLookupKey> keys,
@NonNull final Function<Set<BPartnerCompositeLookupKey>, Map<BPartnerCompositeLookupKey, BPartnerComposite>> valuesLoader)
=======
@NonNull final Collection<OrgAndBPartnerCompositeLookupKey> keys,
@NonNull final Function<
Collection<OrgAndBPartnerCompositeLookupKey>,
Map<OrgAndBPartnerCompositeLookupKey, BPartnerComposite>> valuesLoader)
>>>>>>>
@NonNull final Collection<OrgAndBPartnerCompositeLookupKey> keys,
@NonNull final Function<
Set<OrgAndBPartnerCompositeLookupKey>,
Map<OrgAndBPartnerCompositeLookupKey, BPartnerComposite>> valuesLoader) |
<<<<<<<
public static ClientId ofRepoIdOrSystem(final int repoId)
{
if (repoId == SYSTEM.repoId)
{
return SYSTEM;
}
else if (repoId <= 0)
{
return SYSTEM;
}
else
{
return ofRepoId(repoId);
}
}
=======
public static Optional<ClientId> optionalOfRepoId(final int repoId)
{
return Optional.ofNullable(ofRepoIdOrNull(repoId));
}
>>>>>>>
public static ClientId ofRepoIdOrSystem(final int repoId)
{
if (repoId == SYSTEM.repoId)
{
return SYSTEM;
}
else if (repoId <= 0)
{
return SYSTEM;
}
else
{
return ofRepoId(repoId);
}
}
public static Optional<ClientId> optionalOfRepoId(final int repoId)
{
return Optional.ofNullable(ofRepoIdOrNull(repoId));
} |
<<<<<<<
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
=======
import butterknife.OnClick;
import retrofit.Callback;
import retrofit.Response;
import retrofit.Retrofit;
>>>>>>>
import butterknife.OnClick;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response; |
<<<<<<<
private static final long serialVersionUID = 1022426465L;
=======
private static final long serialVersionUID = -2004309149L;
>>>>>>>
private static final long serialVersionUID = -1061256606L;
<<<<<<<
@Override
public org.compiere.model.I_C_BP_BankAccount getC_BP_BankAccount()
{
return get_ValueAsPO(COLUMNNAME_C_BP_BankAccount_ID, org.compiere.model.I_C_BP_BankAccount.class);
}
@Override
public void setC_BP_BankAccount(org.compiere.model.I_C_BP_BankAccount C_BP_BankAccount)
{
set_ValueFromPO(COLUMNNAME_C_BP_BankAccount_ID, org.compiere.model.I_C_BP_BankAccount.class, C_BP_BankAccount);
}
/** Set Bankverbindung.
@param C_BP_BankAccount_ID
Bankverbindung des Geschäftspartners
*/
@Override
public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID)
{
if (C_BP_BankAccount_ID < 1)
set_Value (COLUMNNAME_C_BP_BankAccount_ID, null);
else
set_Value (COLUMNNAME_C_BP_BankAccount_ID, Integer.valueOf(C_BP_BankAccount_ID));
}
/** Get Bankverbindung.
@return Bankverbindung des Geschäftspartners
*/
@Override
public int getC_BP_BankAccount_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_BankAccount_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set Standort eff..
@param C_BP_Location_Effective_ID
Identifiziert die (Liefer-) Adresse des Geschäftspartners
*/
@Override
public void setC_BP_Location_Effective_ID (int C_BP_Location_Effective_ID)
{
throw new IllegalArgumentException ("C_BP_Location_Effective_ID is virtual column"); }
/** Get Standort eff..
@return Identifiziert die (Liefer-) Adresse des Geschäftspartners
*/
@Override
public int getC_BP_Location_Effective_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Location_Effective_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set Standort abw..
@param C_BP_Location_Override_ID
Identifiziert die (Liefer-) Adresse des Geschäftspartners
*/
@Override
public void setC_BP_Location_Override_ID (int C_BP_Location_Override_ID)
{
if (C_BP_Location_Override_ID < 1)
set_Value (COLUMNNAME_C_BP_Location_Override_ID, null);
else
set_Value (COLUMNNAME_C_BP_Location_Override_ID, Integer.valueOf(C_BP_Location_Override_ID));
}
/** Get Standort abw..
@return Identifiziert die (Liefer-) Adresse des Geschäftspartners
*/
@Override
public int getC_BP_Location_Override_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Location_Override_ID);
if (ii == null)
return 0;
return ii.intValue();
}
=======
>>>>>>>
@Override
public org.compiere.model.I_C_BP_BankAccount getC_BP_BankAccount()
{
return get_ValueAsPO(COLUMNNAME_C_BP_BankAccount_ID, org.compiere.model.I_C_BP_BankAccount.class);
}
@Override
public void setC_BP_BankAccount(org.compiere.model.I_C_BP_BankAccount C_BP_BankAccount)
{
set_ValueFromPO(COLUMNNAME_C_BP_BankAccount_ID, org.compiere.model.I_C_BP_BankAccount.class, C_BP_BankAccount);
}
/** Set Bankverbindung.
@param C_BP_BankAccount_ID
Bankverbindung des Geschäftspartners
*/
@Override
public void setC_BP_BankAccount_ID (int C_BP_BankAccount_ID)
{
if (C_BP_BankAccount_ID < 1)
set_Value (COLUMNNAME_C_BP_BankAccount_ID, null);
else
set_Value (COLUMNNAME_C_BP_BankAccount_ID, Integer.valueOf(C_BP_BankAccount_ID));
}
/** Get Bankverbindung.
@return Bankverbindung des Geschäftspartners
*/
@Override
public int getC_BP_BankAccount_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_BankAccount_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set Standort eff..
@param C_BP_Location_Effective_ID
Identifiziert die (Liefer-) Adresse des Geschäftspartners
*/
@Override
public void setC_BP_Location_Effective_ID (int C_BP_Location_Effective_ID)
{
throw new IllegalArgumentException ("C_BP_Location_Effective_ID is virtual column"); }
/** Get Standort eff..
@return Identifiziert die (Liefer-) Adresse des Geschäftspartners
*/
@Override
public int getC_BP_Location_Effective_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Location_Effective_ID);
if (ii == null)
return 0;
return ii.intValue();
}
/** Set Standort abw..
@param C_BP_Location_Override_ID
Identifiziert die (Liefer-) Adresse des Geschäftspartners
*/
@Override
public void setC_BP_Location_Override_ID (int C_BP_Location_Override_ID)
{
if (C_BP_Location_Override_ID < 1)
set_Value (COLUMNNAME_C_BP_Location_Override_ID, null);
else
set_Value (COLUMNNAME_C_BP_Location_Override_ID, Integer.valueOf(C_BP_Location_Override_ID));
}
/** Get Standort abw..
@return Identifiziert die (Liefer-) Adresse des Geschäftspartners
*/
@Override
public int getC_BP_Location_Override_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_C_BP_Location_Override_ID);
if (ii == null)
return 0;
return ii.intValue();
} |
<<<<<<<
import org.compiere.model.GridField;
import org.compiere.util.Env;
import org.compiere.util.TrxRunnable;
=======
>>>>>>>
import org.compiere.util.TrxRunnable; |
<<<<<<<
@Nullable
=======
/**
* Please use {@link #asLocalDate(Timestamp, ZoneId)}
*/
@Deprecated
>>>>>>>
/**
* Please use {@link #asLocalDate(Timestamp, ZoneId)}
*/
@Deprecated
@Nullable
<<<<<<<
@Nullable
public static LocalTime asLocalTime(@Nullable final Object obj)
=======
@Deprecated
@Nullable
public static LocalDate asLocalDate(@Nullable final ZonedDateTime zonedDateTime)
{
return zonedDateTime != null ? zonedDateTime.toLocalDate() : null;
}
public static LocalTime asLocalTime(final Object obj)
>>>>>>>
@Deprecated
@Nullable
public static LocalDate asLocalDate(@Nullable final ZonedDateTime zonedDateTime)
{
return zonedDateTime != null ? zonedDateTime.toLocalDate() : null;
}
public static LocalTime asLocalTime(@Nullable final Object obj) |
<<<<<<<
* Helper class for massive generation of HUs for a receipt schedule.
* <p>
* Note:The respective {@link I_M_ReceiptSchedule_Alloc}s and {@link I_M_HU_Assignment}s are created via {@link ReceiptScheduleHUTrxListener}.
=======
* Helper class for massive generation of HUs for receipt schedule(s).
>>>>>>>
* Helper class for massive generation of HUs for receipt schedule(s).
* <p>
* Note:The respective {@link I_M_ReceiptSchedule_Alloc}s and {@link I_M_HU_Assignment}s are created via {@link ReceiptScheduleHUTrxListener}.
<<<<<<<
=======
private ILUTUProducerAllocationDestination _lutuProducer;
private ReceiptScheduleHUGenerator()
{
super();
}
>>>>>>>
private ReceiptScheduleHUGenerator()
{
super();
}
<<<<<<<
/**
* Set the context to be used when creating the HUs. This context will also be used for the {@link IHUContext} the HU processing will have place with.
*
* @param context
*/
public final void setContext(final IContextAware context)
=======
private final ReceiptScheduleHUGenerator setContext(final IContextAware context)
>>>>>>>
private final ReceiptScheduleHUGenerator setContext(final IContextAware context)
<<<<<<<
=======
private IHUAllocations getHUAllocations(final I_M_ReceiptSchedule schedule)
{
final int receiptScheduleId = schedule.getM_ReceiptSchedule_ID();
IHUAllocations huAllocations = _receiptSchedule2huAllocations.get(receiptScheduleId);
if (huAllocations == null)
{
final IProductStorage productStorage = getProductStorage(schedule);
huAllocations = new ReceiptScheduleHUAllocations(schedule, productStorage);
_receiptSchedule2huAllocations.put(receiptScheduleId, huAllocations);
}
return huAllocations;
}
public ReceiptScheduleHUGenerator setHUAllocations(final I_M_ReceiptSchedule schedule, final IHUAllocations huAllocations)
{
assertConfigurable();
final int receiptScheduleId = schedule.getM_ReceiptSchedule_ID();
_receiptSchedule2huAllocations.put(receiptScheduleId, huAllocations);
return this;
}
>>>>>>> |
<<<<<<<
=======
import android.graphics.Color;
import android.view.LayoutInflater;
>>>>>>>
import android.graphics.Color;
import android.view.LayoutInflater;
<<<<<<<
=======
private LayoutInflater mInflater;
private int mUpvoteColor;
private int mDownVoteColor;
private boolean mAllowNSFWThumb;
>>>>>>>
private LayoutInflater mInflater;
private int mUpvoteColor;
private int mDownVoteColor;
private boolean mAllowNSFWThumb;
<<<<<<<
=======
mInflater = LayoutInflater.from(context);
mUpvoteColor = context.getResources().getColor(R.color.notoriety_positive);
mDownVoteColor = context.getResources().getColor(R.color.notoriety_negative);
mAllowNSFWThumb = OpenImgurApp.getInstance(context).getPreferences().getBoolean(SettingsActivity.KEY_NSFW_THUMBNAILS, false);
>>>>>>>
mInflater = LayoutInflater.from(context);
mUpvoteColor = context.getResources().getColor(R.color.notoriety_positive);
mDownVoteColor = context.getResources().getColor(R.color.notoriety_negative);
mAllowNSFWThumb = OpenImgurApp.getInstance(context).getPreferences().getBoolean(SettingsActivity.KEY_NSFW_THUMBNAILS, false); |
<<<<<<<
import org.adempiere.util.NumberUtils;
import org.adempiere.util.Services;
import org.compiere.model.I_C_AcctSchema;
import org.compiere.model.I_C_UOM;
=======
import org.adempiere.util.LegacyAdapters;
import org.compiere.model.I_C_ValidCombination;
>>>>>>>
import org.compiere.model.I_C_AcctSchema;
import org.compiere.model.I_C_UOM;
<<<<<<<
import de.metas.product.acct.api.IProductAcctDAO;
import de.metas.quantity.Quantity;
import lombok.NonNull;
=======
import de.metas.util.Check;
import de.metas.util.Services;
>>>>>>>
import de.metas.product.acct.api.IProductAcctDAO;
import de.metas.quantity.Quantity;
import de.metas.util.NumberUtils;
import de.metas.util.Services;
import lombok.NonNull; |
<<<<<<<
import org.adempiere.util.Services;
import org.eevolution.api.ActivityControlCreateRequest;
import org.eevolution.api.IPPCostCollectorBL;
=======
import org.compiere.model.MClient;
import org.compiere.model.MDocType;
import org.compiere.util.Env;
>>>>>>>
import org.eevolution.api.ActivityControlCreateRequest;
import org.eevolution.api.IPPCostCollectorBL;
<<<<<<<
import com.google.common.collect.ImmutableList;
=======
import de.metas.cache.CCache;
>>>>>>>
import com.google.common.collect.ImmutableList; |
<<<<<<<
import org.adempiere.util.Services;
import org.adempiere.warehouse.LocatorId;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseBL;
=======
>>>>>>>
import org.adempiere.warehouse.LocatorId;
import org.adempiere.warehouse.WarehouseId;
import org.adempiere.warehouse.api.IWarehouseBL; |
<<<<<<<
mUploadMenu = findViewById(R.id.uploadMenu);
mUploadButton = (FloatingActionButton) mUploadMenu.findViewById(R.id.uploadButton);
mUploadButton.setColor(getResources().getColor(theme.accentColor));
mLinkUpload = (FloatingActionButton) mUploadMenu.findViewById(R.id.linkUpload);
mLinkUpload.setColor(getResources().getColor(theme.accentColor));
mCameraUpload = (FloatingActionButton) mUploadMenu.findViewById(R.id.cameraUpload);
mCameraUpload.setColor(getResources().getColor(theme.accentColor));
mGalleryUpload = (FloatingActionButton) mUploadMenu.findViewById(R.id.galleryUpload);
mGalleryUpload.setColor(getResources().getColor(theme.accentColor));
mUploadButton.setOnClickListener(this);
mLinkUpload.setOnClickListener(this);
mCameraUpload.setOnClickListener(this);
mGalleryUpload.setOnClickListener(this);
=======
>>>>>>>
mUploadButton.setColor(getResources().getColor(theme.accentColor));
mLinkUpload.setColor(getResources().getColor(theme.accentColor));
mCameraUpload.setColor(getResources().getColor(theme.accentColor));
mGalleryUpload.setColor(getResources().getColor(theme.accentColor)); |
<<<<<<<
public void onResponse(Call<TrophyResponse> call, Response<TrophyResponse> response) {
=======
public void onResponse(Response<TrophyResponse> response, Retrofit retrofit) {
if (!isAdded()) return;
>>>>>>>
public void onResponse(Call<TrophyResponse> call, Response<TrophyResponse> response) {
<<<<<<<
public void onFailure(Call<TrophyResponse> call, Throwable t) {
=======
public void onFailure(Throwable t) {
if (!isAdded()) return;
>>>>>>>
public void onFailure(Call<TrophyResponse> call, Throwable t) {
if (!isAdded()) return; |
<<<<<<<
final Builder layoutSingleRow = layoutSingleRow();
final DocumentLayoutDetailDescriptor.Builder layoutDetail = DocumentLayoutDetailDescriptor
.builder(entityDescriptor.getWindowId(), entityDescriptor.getDetailId())
.caption(entityDescriptor.getCaption())
.description(entityDescriptor.getDescription())
=======
return DocumentLayoutDetailDescriptor.builder(entityDescriptor.getWindowId(), entityDescriptor.getDetailId())
>>>>>>>
final Builder layoutSingleRow = layoutSingleRow();
final DocumentLayoutDetailDescriptor.Builder layoutDetail = DocumentLayoutDetailDescriptor
.builder(entityDescriptor.getWindowId(), entityDescriptor.getDetailId())
.caption(entityDescriptor.getCaption())
.description(entityDescriptor.getDescription())
<<<<<<<
.singleRowLayout(layoutSingleRow)
.queryOnActivate(entityDescriptor.isQueryIncludedTabOnActivate());
=======
.singleRowLayout(layoutSingleRow())
.queryOnActivate(entityDescriptor.isQueryIncludedTabOnActivate())
.supportQuickInput(isSupportQuickInput(entityDescriptor));
}
>>>>>>>
.singleRowLayout(layoutSingleRow)
.queryOnActivate(entityDescriptor.isQueryIncludedTabOnActivate())
.supportQuickInput(isSupportQuickInput(entityDescriptor));
} |
<<<<<<<
=======
import com.kenny.openimgur.util.SqlHelper;
import com.squareup.okhttp.Interceptor;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response;
>>>>>>>
import com.kenny.openimgur.util.SqlHelper; |
<<<<<<<
import org.adempiere.util.Services;
=======
>>>>>>>
<<<<<<<
import lombok.Builder;
=======
import de.metas.util.Check;
import de.metas.util.Services;
>>>>>>>
import de.metas.util.Services;
import lombok.Builder; |
<<<<<<<
import org.adempiere.service.ClientId;
import org.compiere.model.I_C_BP_BankAccount;
import org.compiere.model.I_C_BP_Group;
=======
import org.adempiere.service.ClientId;
import org.compiere.model.I_C_BP_Group;
>>>>>>>
import org.adempiere.service.ClientId;
import org.compiere.model.I_C_BP_BankAccount;
import org.compiere.model.I_C_BP_Group;
<<<<<<<
import de.metas.currency.ICurrencyDAO;
import de.metas.currency.impl.PlainCurrencyDAO;
import de.metas.money.CurrencyId;
=======
import de.metas.location.CountryId;
>>>>>>>
import de.metas.currency.ICurrencyDAO;
import de.metas.currency.impl.PlainCurrencyDAO;
import de.metas.location.CountryId;
import de.metas.money.CurrencyId;
<<<<<<<
final I_M_Product product = newInstanceOutOfTrx(I_M_Product.class);
POJOWrapper.setInstanceName(product, name);
product.setValue(name);
product.setName(name);
product.setC_UOM_ID(uom.getC_UOM_ID());
product.setProductType(ProductType.Item.getCode());
product.setIsStocked(true);
if (weightKg != null)
{
product.setWeight(weightKg);
}
saveRecord(product);
=======
final I_C_BPartner bpartner = newInstanceOutOfTrx(I_C_BPartner.class);
POJOWrapper.setInstanceName(bpartner, nameAndValue);
bpartner.setValue(nameAndValue);
bpartner.setName(nameAndValue);
saveRecord(bpartner);
>>>>>>>
final I_C_BPartner bpartner = newInstanceOutOfTrx(I_C_BPartner.class);
POJOWrapper.setInstanceName(bpartner, nameAndValue);
bpartner.setValue(nameAndValue);
bpartner.setName(nameAndValue);
saveRecord(bpartner);
<<<<<<<
public static I_C_BP_Group createBPGroup(final String name, final boolean isDefault)
{
final I_C_BP_Group bpGroupRecord = newInstanceOutOfTrx(I_C_BP_Group.class);
POJOWrapper.setInstanceName(bpGroupRecord, name);
bpGroupRecord.setName(name);
bpGroupRecord.setIsDefault(isDefault);
InterfaceWrapperHelper.setValue(bpGroupRecord, I_C_BP_Group.COLUMNNAME_AD_Client_ID, ClientId.METASFRESH.getRepoId());
saveRecord(bpGroupRecord);
return bpGroupRecord;
}
public static I_C_BP_BankAccount createBpBankAccount(@NonNull final BPartnerId bPartnerId, @NonNull final CurrencyId currencyId, @Nullable String iban)
{
final I_C_BP_BankAccount bpBankAccount = newInstance(I_C_BP_BankAccount.class);
bpBankAccount.setIBAN(iban);
bpBankAccount.setC_BPartner_ID(bPartnerId.getRepoId());
bpBankAccount.setC_Currency_ID(currencyId.getRepoId());
saveRecord(bpBankAccount);
return bpBankAccount;
}
=======
public static I_C_BP_Group createBPGroup(final String name, final boolean isDefault)
{
final I_C_BP_Group bpGroupRecord = newInstanceOutOfTrx(I_C_BP_Group.class);
POJOWrapper.setInstanceName(bpGroupRecord, name);
bpGroupRecord.setName(name);
bpGroupRecord.setIsDefault(isDefault);
InterfaceWrapperHelper.setValue(bpGroupRecord, I_C_BP_Group.COLUMNNAME_AD_Client_ID, ClientId.METASFRESH.getRepoId());
saveRecord(bpGroupRecord);
return bpGroupRecord;
}
>>>>>>>
public static I_C_BP_Group createBPGroup(final String name, final boolean isDefault)
{
final I_C_BP_Group bpGroupRecord = newInstanceOutOfTrx(I_C_BP_Group.class);
POJOWrapper.setInstanceName(bpGroupRecord, name);
bpGroupRecord.setName(name);
bpGroupRecord.setIsDefault(isDefault);
InterfaceWrapperHelper.setValue(bpGroupRecord, I_C_BP_Group.COLUMNNAME_AD_Client_ID, ClientId.METASFRESH.getRepoId());
saveRecord(bpGroupRecord);
return bpGroupRecord;
}
public static I_C_BP_BankAccount createBpBankAccount(@NonNull final BPartnerId bPartnerId, @NonNull final CurrencyId currencyId, @Nullable String iban)
{
final I_C_BP_BankAccount bpBankAccount = newInstance(I_C_BP_BankAccount.class);
bpBankAccount.setIBAN(iban);
bpBankAccount.setC_BPartner_ID(bPartnerId.getRepoId());
bpBankAccount.setC_Currency_ID(currencyId.getRepoId());
saveRecord(bpBankAccount);
return bpBankAccount;
} |
<<<<<<<
import de.metas.product.IProductBL;
=======
import de.metas.util.Services;
>>>>>>>
import de.metas.product.IProductBL;
import de.metas.util.Services; |
<<<<<<<
=======
import org.slf4j.Logger;
import de.metas.logging.LogManager;
import de.metas.process.ProcessInfoParameter;
import de.metas.util.Services;
import de.metas.process.JavaProcess;
>>>>>>> |
<<<<<<<
import org.adempiere.util.Check;
import org.adempiere.util.Services;
=======
>>>>>>>
<<<<<<<
import de.metas.product.IProductDAO;
import de.metas.product.ProductId;
=======
import de.metas.util.Check;
>>>>>>>
import de.metas.product.IProductDAO;
import de.metas.product.ProductId;
import de.metas.util.Check;
import de.metas.util.Services; |
<<<<<<<
import org.adempiere.util.Services;
import org.compiere.Adempiere;
=======
import org.adempiere.model.engines.CostDimension;
>>>>>>>
import org.compiere.Adempiere;
<<<<<<<
import de.metas.product.IProductBL;
=======
import de.metas.util.Services;
>>>>>>>
import de.metas.product.IProductBL;
import de.metas.util.Services; |
<<<<<<<
import de.metas.picking.api.PickingSlotId;
=======
import de.metas.util.Services;
>>>>>>>
import de.metas.picking.api.PickingSlotId;
import de.metas.util.Services; |
<<<<<<<
import de.metas.handlingunits.picking.PickingCandidateCommand;
import de.metas.handlingunits.picking.PickingCandidateCommand.RemoveQtyFromHURequest;
import de.metas.handlingunits.sourcehu.HuId2SourceHUsService;
=======
import de.metas.handlingunits.picking.PickingCandidateService;
import de.metas.handlingunits.picking.PickingCandidateService.RemoveQtyFromHURequest;
import de.metas.handlingunits.picking.SourceHUsRepository;
>>>>>>>
import de.metas.handlingunits.picking.PickingCandidateService;
import de.metas.handlingunits.picking.PickingCandidateService.RemoveQtyFromHURequest;
import de.metas.handlingunits.sourcehu.HuId2SourceHUsService; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.