diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy new file mode 100644 index 00000000..51b09c0b --- /dev/null +++ b/Jenkinsfile.groovy @@ -0,0 +1,72 @@ +pipeline { + agent { + label 'master' + } + + options { + buildDiscarder(logRotator(numToKeepStr: '30', artifactNumToKeepStr: '10')) + disableConcurrentBuilds() + } + + environment { + // ANDROID_HOME = "/usr/local/android/sdk" // Cambia in base al tuo sistema + JAVA_HOME = tool 'JDK 17.0.6 x64' // Nome dello strumento configurato in Jenkins + PATH = "${env.JAVA_HOME}\\bin;${env.PATH}" + } + + stages { + + stage('Preparing') { + when { + expression { + return env.GIT_BRANCH == "master-beta" + } + } + steps { + bat "./gradlew addBetaSuffix" + } + } + + stage('Build') { + steps { + bat "./gradlew assembleRelease" + archiveArtifacts artifacts: 'app/build/outputs/apk/release/', onlyIfSuccessful: true + } + } + + stage('Publish') { + steps { + azureUpload allowAnonymousAccess: true, fileShareName: 'storage-ci', filesPath: 'app/build/outputs/apk/release/*', removePrefixPath: 'app/build/outputs/apk/release/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'wms' + } + } + } + + post { + success { + script { + bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false"' + bat 'curl -k "https://devservices.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"' + bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false"' + bat 'curl -k "https://services.studioml.it/ems-api/updateWMSApp?overrideForced=false&suffix=beta"' + if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") { + office365ConnectorSend adaptiveCards: true, color: '#008000', message: 'WMS è stato compilato con successo', status: 'SUCCESS', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE' + } + } + } + unstable { + script { + if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") { + office365ConnectorSend adaptiveCards: true, color: '#FFDE21', message: 'WMS è INSTABILE', status: 'UNSTABLE', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE' + } + } + } + failure { + script { + if (env.GIT_BRANCH == "master" || env.GIT_BRANCH == "master-beta") { + office365ConnectorSend adaptiveCards: true, color: '#FF2C2C', message: 'Errore di compilazione su WMS', status: 'FAILURE', webhookUrl: 'https://prod-89.westeurope.logic.azure.com:443/workflows/260580715a9d4447a54dea861a865536/triggers/manual/paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&sv=1.0&sig=EMqPHohvE5o5IGj_gir_iQaAufR4r8ZJxlFx52jklSE' + } + } + } + } + +} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0933d41c..91a5cc43 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 503 - def appVersionName = '1.46.15' + def appVersionCode = 520 + def appVersionName = '1.47.07' signingConfigs { release { @@ -51,9 +51,13 @@ android { buildTypes { debug { ext.enableCrashlytics = false +// minifyEnabled true // Abilita la minimizzazione del codice +// shrinkResources true // Rimuove risorse non utilizzate +// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } release { - minifyEnabled false +// minifyEnabled true // Abilita la minimizzazione del codice +// shrinkResources true // Rimuove risorse non utilizzate proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release } @@ -74,12 +78,7 @@ android { } - build { - doLast { - delete "$projectDir/build/outputs/apk/release/version.txt" - file("$projectDir/build/outputs/apk/release/version.txt").text = appVersionCode + '\n' + appVersionName + '\n' + 'forced=true' - } - } + gradle.projectsEvaluated { tasks.withType(JavaCompile.class).tap { @@ -107,12 +106,11 @@ dependencies { // exclude group: 'com.android.support', module: 'support-annotations' // }) // implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'com.github.lupaulus:logger:2.3.2' - //Firebase - // Import the Firebase BoM - implementation platform('com.google.firebase:firebase-bom:33.13.0') + implementation platform('com.google.firebase:firebase-bom:33.14.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-crashlytics' implementation 'com.google.firebase:firebase-perf' @@ -123,14 +121,12 @@ dependencies { runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' - implementation 'com.google.guava:guava:33.4.0-android' - implementation 'androidx.appcompat:appcompat:1.7.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.2.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.4.0' + implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation('androidx.preference:preference-ktx:1.2.1') { exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel' @@ -138,19 +134,18 @@ dependencies { } implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0" - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.squareup.retrofit2:retrofit:2.9.0' - implementation 'com.squareup.retrofit2:converter-gson:2.9.0' + implementation 'com.squareup.retrofit2:retrofit:2.11.0' + implementation 'com.squareup.retrofit2:converter-gson:2.11.0' implementation 'com.annimon:stream:1.2.2' implementation 'androidx.lifecycle:lifecycle-runtime:2.9.0' implementation 'org.apache.commons:commons-text:1.9' //MVVM def dagger2_version = '2.55' - api "com.google.dagger:dagger:$dagger2_version" + implementation "com.google.dagger:dagger:$dagger2_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version" - api "com.google.dagger:dagger-android:$dagger2_version" - api "com.google.dagger:dagger-android-support:$dagger2_version" + implementation "com.google.dagger:dagger-android:$dagger2_version" + implementation "com.google.dagger:dagger-android-support:$dagger2_version" // if you use the support libraries annotationProcessor "com.google.dagger:dagger-android-processor:$dagger2_version" @@ -191,10 +186,7 @@ dependencies { implementation 'io.reactivex.rxjava2:rxjava:2.1.12' implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' - implementation 'org.greenrobot:eventbus:3.3.1' - //Barcode generator -// implementation group: 'com.google.zxing', name: 'core', version: '3.5.3' implementation 'com.journeyapps:zxing-android-embedded:4.3.0' } @@ -203,3 +195,49 @@ repositories { google() maven { url 'https://jitpack.io' } } + +tasks.register('addBetaSuffix') { + doLast { + def gradleFile = file("build.gradle") + def content = gradleFile.text + + // Modifica appVersionName + content = content.replaceAll(/appVersionName\s*=\s*'(.*?)'/) { fullMatch, version -> + "appVersionName = '${version}-beta'" + } + + // Modifica outputFileName + content = content.replaceAll(/output\.outputFileName\s*=\s*"(.*?)"/) { fullMatch, filename -> + "output.outputFileName = \"${filename.replace('.apk', '-beta.apk')}\"" + } + + // Modifica direttamente la riga che crea 'version.txt' in 'version-beta.txt' + content = content.replace( + "def versionFile = new File(outputDir, \"version.txt\")", + "def versionFile = new File(outputDir, \"version-beta.txt\")" + ) + + // Sovrascrivi il file + gradleFile.write(content) + } +} + +tasks.register('createVersionFile') { + doLast { + def outputDir = file("${projectDir}/build/outputs/apk/release") + def versionFile = new File(outputDir, "version.txt") + + // Cancella il file se esiste + if (versionFile.exists()) { + versionFile.delete() + } + + // Crea il file con i contenuti desiderati + versionFile.write("${android.defaultConfig.versionCode}\n${android.defaultConfig.versionName}\nforced=true") + } +} + + +afterEvaluate { + tasks.assembleRelease.finalizedBy createVersionFile +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 579e09fa..9c4ec8eb 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -23,3 +23,20 @@ # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile +# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory, +# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter) +-keep class * extends com.google.gson.TypeAdapter +-keep class * implements com.google.gson.TypeAdapterFactory +-keep class * implements com.google.gson.JsonSerializer +-keep class * implements com.google.gson.JsonDeserializer +# Prevent R8 from leaving Data object members always null +-keepclasseswithmembers class * { + (...); + @com.google.gson.annotations.SerializedName ; +} +# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher. +-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken +-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken + +-keep class it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; } +-keep class * extends it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse { *; } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java index 26feba57..4c1ef1d6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java @@ -313,8 +313,8 @@ public class MainApplicationModule { @Provides @Singleton - DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder) { - return new DocumentRESTConsumer(restBuilder); + DocumentRESTConsumer provideDocumentiRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) { + return new DocumentRESTConsumer(restBuilder, executorService); } @Provides diff --git a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java index c5405de0..fe87f08e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java @@ -66,9 +66,6 @@ public class Ean128Service { switch (aiModel.AI) { case SSCC -> { - if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) { - aiValue = new StringBuilder(aiValue.substring(1)); - } model.Sscc = aiValue.toString(); } case GTIN -> { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java index 9ae9fe08..0792d402 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/AuthInterceptor.java @@ -28,7 +28,7 @@ public class AuthInterceptor implements Interceptor { public Response intercept(@NonNull Chain chain) throws IOException { var originalRequest = chain.request(); - if (SettingsManager.i().getUserSession() != null) { + if (SettingsManager.i().getUserSession() != null && SettingsManager.i().getUserSession().getAccessToken() != null) { var accessToken = SettingsManager.i().getUserSession().getAccessToken(); var accessTokenExpiryDate = SettingsManager.i().getUserSession().getAccessTokenExpiryDate(); @@ -55,21 +55,22 @@ public class AuthInterceptor implements Interceptor { .protocol(Protocol.HTTP_1_1) .code(401) .message("Unauthorized") - .body(ResponseBody.create(new byte[0], null)) + .body(ResponseBody.create(okhttp3.MediaType.get("application/json"), new byte[0])) .build(); } catch (Exception e) { return chain.proceed(originalRequest); } + //Retrieve the new access token after refresh + accessToken = SettingsManager.i().getUserSession().getAccessToken(); + } - // Add the access token to the request header - var authorizedRequest = originalRequest.newBuilder() - .header("Authorization", "Bearer " + SettingsManager.i().getUserSession().getAccessToken()) - .build(); + // Add the access token to the request header + var authorizedRequest = originalRequest.newBuilder() + .header("Authorization", "Bearer " + accessToken) + .build(); - return chain.proceed(authorizedRequest); - } else - return chain.proceed(originalRequest); + return chain.proceed(authorizedRequest); } else return chain.proceed(originalRequest); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java index 18a26043..2a397fe5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java @@ -3,7 +3,6 @@ package it.integry.integrywmsnative.core.rest; import java.io.IOException; import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UtilityDate; import okhttp3.HttpUrl; import okhttp3.Interceptor; import okhttp3.Request; @@ -31,18 +30,6 @@ public class HttpInterceptor implements Interceptor { .addHeader("Accept", "*/*") .addHeader("x-app-token", APP_TOKEN); - - String accessToken = null; - - //Nel caso in cui il token è scaduto e devo richiamare la refresh non bisogna passare il vecchio token - if(SettingsManager.i().getUserSession().getAccessTokenExpiryDate() != null && - UtilityDate.getNowTime().isBefore(SettingsManager.i().getUserSession().getAccessTokenExpiryDate().minusSeconds(20))) { - accessToken = SettingsManager.i().getUserSession().getAccessToken(); - } - - if(accessToken != null) - builder.header("Authorization", "Bearer " + accessToken); - var newRequest = builder .url(url) .build(); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java index dd09148a..9ce45beb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentRESTConsumer.java @@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.rest.consumers; import androidx.annotation.NonNull; import java.util.List; +import java.util.concurrent.ExecutorService; import javax.inject.Singleton; @@ -20,9 +21,11 @@ import retrofit2.Response; public class DocumentRESTConsumer extends _BaseRESTConsumer { private final RESTBuilder restBuilder; + private final ExecutorService executorService; - public DocumentRESTConsumer(RESTBuilder restBuilder) { + public DocumentRESTConsumer(RESTBuilder restBuilder, ExecutorService executorService) { this.restBuilder = restBuilder; + this.executorService = executorService; } public void createDocsFromColli(List listColli, RunnableArgs> onComplete, RunnableArgs onFailed) { @@ -40,19 +43,22 @@ public class DocumentRESTConsumer extends _BaseRESTConsumer { }); } - public void createDocFromColli(LoadColliDTO loadColliDTO, RunnableArgs onComplete, RunnableArgs onFailed) { + public DtbDoct makeSynchronousCreateDocFromColliRequest(LoadColliDTO loadColliDTO) throws Exception { DocumentiRESTConsumerService documentiRESTConsumerService = restBuilder.getService(DocumentiRESTConsumerService.class); - documentiRESTConsumerService + var response = documentiRESTConsumerService .createDocFromColli(loadColliDTO) - .enqueue(new ManagedErrorCallback<>() { - @Override - public void onResponse(Call> call, Response> response) { - analyzeAnswer(response, "createDocFromColli", onComplete, onFailed); - } + .execute(); - @Override - public void onFailure(Call> call, @NonNull final Exception e) { - onFailed.run(e); + return analyzeAnswer(response, "createDocFromColli"); + } + + public void makeCreateDocFromColliRequest(LoadColliDTO loadColliDTO, RunnableArgs onComplete, RunnableArgs onFailed) { + executorService.execute(() -> { + try { + var result = makeSynchronousCreateDocFromColliRequest(loadColliDTO); + if (onComplete != null) onComplete.run(result); + } catch (Exception ex) { + if (onFailed != null) onFailed.run(ex); } }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumer.java index e755444a..02a6b03a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumer.java @@ -5,8 +5,11 @@ import java.util.List; import java.util.concurrent.ExecutorService; import it.integry.integrywmsnative.core.rest.RESTBuilder; +import it.integry.integrywmsnative.core.rest.model.pv.CloseVerificaRequestDTO; +import it.integry.integrywmsnative.core.rest.model.pv.DeleteRowVerificaRequestDTO; import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO; -import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO; +import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO; +import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDTO; public class GiacenzaPvRESTConsumer extends _BaseRESTConsumer { @@ -30,12 +33,36 @@ public class GiacenzaPvRESTConsumer extends _BaseRESTConsumer { return giacenzeList != null ? giacenzeList : new ArrayList<>(); } - public void saveNewVerificaSynchronized(SaveNewVerificaRequestDTO saveNewVerificaRequest) throws Exception { + public void saveNewRowSynchronized(SaveNewRowVerificaRequestDTO saveNewRowVerificaRequest) throws Exception { GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0); - var response = giacenzaPvRESTConsumerService.saveNewVerifica(saveNewVerificaRequest) + var response = giacenzaPvRESTConsumerService.saveNewRowVerifica(saveNewRowVerificaRequest) .execute(); - analyzeAnswer(response, "save-verifica-pv"); + analyzeAnswer(response, "save-row-verifica-pv"); + } + + public void updateRowSynchronized(UpdateRowVerificaRequestDTO updateRowVerificaRequest) throws Exception { + GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0); + var response = giacenzaPvRESTConsumerService.updateRowVerifica(updateRowVerificaRequest) + .execute(); + + analyzeAnswer(response, "update-row-verifica-pv"); + } + + public void deleteRowSynchronized(DeleteRowVerificaRequestDTO deleteRowVerificaRequest) throws Exception { + GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0); + var response = giacenzaPvRESTConsumerService.deleteRowVerifica(deleteRowVerificaRequest) + .execute(); + + analyzeAnswer(response, "delete-row-verifica-pv"); + } + + public void closeVerifica(CloseVerificaRequestDTO closeVerificaRequestDTO) throws Exception { + GiacenzaPvRESTConsumerService giacenzaPvRESTConsumerService = restBuilder.getService(GiacenzaPvRESTConsumerService.class, 0); + var response = giacenzaPvRESTConsumerService.closeVerifica(closeVerificaRequestDTO) + .execute(); + + analyzeAnswer(response, "close-verifica-pv"); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java index c4ef0149..0d039c12 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaPvRESTConsumerService.java @@ -3,8 +3,11 @@ package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; +import it.integry.integrywmsnative.core.rest.model.pv.CloseVerificaRequestDTO; +import it.integry.integrywmsnative.core.rest.model.pv.DeleteRowVerificaRequestDTO; import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO; -import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO; +import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO; +import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDTO; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.GET; @@ -17,6 +20,15 @@ public interface GiacenzaPvRESTConsumerService { Call>> retrieve(@Query("codMdep") String codMdep); - @POST("wms/pv/verifica_giacenze/save_new_verifica") - Call> saveNewVerifica(@Body SaveNewVerificaRequestDTO saveNewVerificaRequest); + @POST("wms/pv/verifica_giacenze/save_new_row") + Call> saveNewRowVerifica(@Body SaveNewRowVerificaRequestDTO saveNewRowVerificaRequest); + + @POST("wms/pv/verifica_giacenze/update_row") + Call> updateRowVerifica(@Body UpdateRowVerificaRequestDTO updateRowVerificaRequest); + + @POST("wms/pv/verifica_giacenze/delete_row") + Call> deleteRowVerifica(@Body DeleteRowVerificaRequestDTO deleteRowVerificaRequest); + + @POST("wms/pv/verifica_giacenze/close_verifica") + Call> closeVerifica(@Body CloseVerificaRequestDTO closeVerificaRequest); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java index 0c926505..c3ae2f15 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PrinterRESTConsumer.java @@ -125,13 +125,12 @@ public class PrinterRESTConsumer extends _BaseRESTConsumer { public void printClosedOrdersSynchronized(PrintOrderCloseDTO dto, String codMdep) throws Exception { if (BuildConfig.DEBUG) { - return; +// return; } PrinterRESTConsumerService printerService = restBuilder.getService(PrinterRESTConsumerService.class, 240); - Call> callable = printerService.printClosedOrders(codMdep, dto); - var response = callable.execute(); + var response = printerService.printClosedOrders(codMdep, dto).execute(); analyzeAnswer(response, "printCollo"); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/CloseVerificaRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/CloseVerificaRequestDTO.java new file mode 100644 index 00000000..7ad60af1 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/CloseVerificaRequestDTO.java @@ -0,0 +1,27 @@ +package it.integry.integrywmsnative.core.rest.model.pv; + +import java.time.LocalDateTime; + +public class CloseVerificaRequestDTO { + + private String codMdep; + private LocalDateTime dataVerifica; + + public String getCodMdep() { + return codMdep; + } + + public CloseVerificaRequestDTO setCodMdep(String codMdep) { + this.codMdep = codMdep; + return this; + } + + public LocalDateTime getDataVerifica() { + return dataVerifica; + } + + public CloseVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) { + this.dataVerifica = dataVerifica; + return this; + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/DeleteRowVerificaRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/DeleteRowVerificaRequestDTO.java new file mode 100644 index 00000000..fde7b7e6 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/DeleteRowVerificaRequestDTO.java @@ -0,0 +1,37 @@ +package it.integry.integrywmsnative.core.rest.model.pv; + +import java.time.LocalDateTime; + +public class DeleteRowVerificaRequestDTO { + + private String codMdep; + private LocalDateTime dataVerifica; + private VerificaGiacenzeRowDTO row; + + public String getCodMdep() { + return codMdep; + } + + public DeleteRowVerificaRequestDTO setCodMdep(String codMdep) { + this.codMdep = codMdep; + return this; + } + + public LocalDateTime getDataVerifica() { + return dataVerifica; + } + + public DeleteRowVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) { + this.dataVerifica = dataVerifica; + return this; + } + + public VerificaGiacenzeRowDTO getRow() { + return row; + } + + public DeleteRowVerificaRequestDTO setRow(VerificaGiacenzeRowDTO row) { + this.row = row; + return this; + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewRowVerificaRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewRowVerificaRequestDTO.java new file mode 100644 index 00000000..71846386 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewRowVerificaRequestDTO.java @@ -0,0 +1,38 @@ +package it.integry.integrywmsnative.core.rest.model.pv; + +import java.time.LocalDateTime; + +public class SaveNewRowVerificaRequestDTO { + + private String codMdep; + private LocalDateTime dataVerifica; + private VerificaGiacenzeRowDTO row; + + + public String getCodMdep() { + return codMdep; + } + + public SaveNewRowVerificaRequestDTO setCodMdep(String codMdep) { + this.codMdep = codMdep; + return this; + } + + public LocalDateTime getDataVerifica() { + return dataVerifica; + } + + public SaveNewRowVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) { + this.dataVerifica = dataVerifica; + return this; + } + + public VerificaGiacenzeRowDTO getRow() { + return row; + } + + public SaveNewRowVerificaRequestDTO setRow(VerificaGiacenzeRowDTO row) { + this.row = row; + return this; + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewVerificaRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewVerificaRequestDTO.java deleted file mode 100644 index 54e13263..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/SaveNewVerificaRequestDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package it.integry.integrywmsnative.core.rest.model.pv; - -public class SaveNewVerificaRequestDTO { - - private VerificaGiacenzeDTO data; - - public VerificaGiacenzeDTO getData() { - return data; - } - - public SaveNewVerificaRequestDTO setData(VerificaGiacenzeDTO data) { - this.data = data; - return this; - } -} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/UpdateRowVerificaRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/UpdateRowVerificaRequestDTO.java new file mode 100644 index 00000000..838f7a1d --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/model/pv/UpdateRowVerificaRequestDTO.java @@ -0,0 +1,38 @@ +package it.integry.integrywmsnative.core.rest.model.pv; + +import java.time.LocalDateTime; + +public class UpdateRowVerificaRequestDTO { + + private String codMdep; + private LocalDateTime dataVerifica; + private VerificaGiacenzeRowDTO row; + + + public String getCodMdep() { + return codMdep; + } + + public UpdateRowVerificaRequestDTO setCodMdep(String codMdep) { + this.codMdep = codMdep; + return this; + } + + public LocalDateTime getDataVerifica() { + return dataVerifica; + } + + public UpdateRowVerificaRequestDTO setDataVerifica(LocalDateTime dataVerifica) { + this.dataVerifica = dataVerifica; + return this; + } + + public VerificaGiacenzeRowDTO getRow() { + return row; + } + + public UpdateRowVerificaRequestDTO setRow(VerificaGiacenzeRowDTO row) { + this.row = row; + return this; + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java index 7b48b338..905ffe27 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/DBSettingsModel.java @@ -98,6 +98,7 @@ public class DBSettingsModel { private boolean flagAccettazioneGroupListForn = false; private boolean flagSpedizioneEnableFastPicking = false; private boolean flagAccettazioneBollaEditableQtaTot = true; + private boolean flagViewSwitchDepoButton = true; public boolean isFlagSpedizioneEnableFakeGiacenza() { return flagSpedizioneEnableFakeGiacenza; @@ -824,4 +825,12 @@ public class DBSettingsModel { public void setFlagAccettazioneBollaEditableQtaTot(boolean flagAccettazioneBollaEditableQtaTot) { this.flagAccettazioneBollaEditableQtaTot = flagAccettazioneBollaEditableQtaTot; } + + public boolean isFlagViewSwitchDepoButton() { + return flagViewSwitchDepoButton; + } + + public void setFlagViewSwitchDepoButton(boolean flagViewSwitchDepoButton) { + this.flagViewSwitchDepoButton = flagViewSwitchDepoButton; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java index 8cd2c5ab..2b10e613 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/settings/SettingsManager.java @@ -623,6 +623,13 @@ public class SettingsManager { .setKeySection("ENABLE_ART_CREATION") .setSetter(dbSettingsModelIstance::setFlagEnableArtCreation)); + stbGestSetupReaderList.add(new StbGestSetupReader<>(Boolean.class) + .setGestName("PICKING") + .setSection("SETUP") + .setKeySection("VIEW_SWITCH_DEPO_BUTTON") + .setSetter(dbSettingsModelIstance::setFlagViewSwitchDepoButton) + ); + stbGestSetupReaderList.add(new StbGestSetupReader<>(String.class) .setGestName("PICKING") .setSection("SETUP") diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java index 0d446873..7fc200d0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java @@ -78,7 +78,7 @@ public class UtilityBarcode { public static boolean isEanPeso(BarcodeScanDTO barcodeScanDTO) { - return (isEtichetta128(barcodeScanDTO) || isEan13(barcodeScanDTO)) && barcodeScanDTO.getStringValue().startsWith("2"); + return (isEtichetta128(barcodeScanDTO) || isEan13(barcodeScanDTO)) && barcodeScanDTO.getStringValue().length() == 13 && barcodeScanDTO.getStringValue().startsWith("2"); } public static boolean isEan8(BarcodeScanDTO barcodeScanDTO) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/adapter/DialogSelectDocInfo_FornitoreAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/adapter/DialogSelectDocInfo_FornitoreAdapter.java index d06aa76e..a608e957 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/adapter/DialogSelectDocInfo_FornitoreAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/dialog/adapter/DialogSelectDocInfo_FornitoreAdapter.java @@ -45,9 +45,7 @@ public class DialogSelectDocInfo_FornitoreAdapter extends ArrayAdapter profilesData; public long getDeviceId() { @@ -36,11 +42,22 @@ public class AuthTokenClaimsDTO { } public class User { + @SerializedName("username") private String username; + + @SerializedName("email") private Object email; + + @SerializedName("fullname") private String fullname; + + @SerializedName("keyGroup") private int keyGroup; + + @SerializedName("attivo") private boolean attivo; + + @SerializedName("type") private String type; public String getUsername() { @@ -99,6 +116,7 @@ public class AuthTokenClaimsDTO { } public static class AuthTokenProfileDetails { + @SerializedName("defaultDepo") private AuthTokenDepoDetails defaultDepo; public AuthTokenDepoDetails getDefaultDepo() { @@ -112,8 +130,13 @@ public class AuthTokenClaimsDTO { } public static class AuthTokenDepoDetails { + @SerializedName("codMdep") private String codMdep; + + @SerializedName("descrizione") private String descrizione; + + @SerializedName("codJfas") private String codJfas; public String getCodMdep() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java index f51af87e..404259b0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/AuthenticationJwtResponseDTO.java @@ -1,12 +1,20 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; import java.time.LocalDateTime; public class AuthenticationJwtResponseDTO { + @SerializedName("accessToken") private String accessToken; + + @SerializedName("refreshToken") private String refreshToken; + + @SerializedName("expiryDate") private LocalDateTime expiryDate; + + @SerializedName("expireIn") private long expireIn; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java index 062c0aae..9afdf740 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginAziendaDTO.java @@ -1,11 +1,22 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; + public class LoginAziendaDTO { + @SerializedName("profileDb") private String profileDb; + + @SerializedName("endpointRestApi") private String endpointRestApi; + + @SerializedName("phpApi") private String phpApi; + + @SerializedName("repoPhoto") private String repoPhoto; + + @SerializedName("endpointPvm") private String endpointPvm; public String getProfileDb() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java index d124cce2..19249849 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginRequestDTO.java @@ -1,9 +1,16 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; + public class LoginRequestDTO { + @SerializedName("username") private String username; + + @SerializedName("password") private String password; + + @SerializedName("deviceId") private String deviceId; public String getUsername() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginResponseDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginResponseDTO.java index c8dae711..10bd7480 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginResponseDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/LoginResponseDTO.java @@ -1,12 +1,15 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; import java.util.List; public class LoginResponseDTO { + @SerializedName("fullName") private String fullName; - private List availableProfiles; + @SerializedName("availableProfiles") + private List availableProfiles; public String getFullName() { return fullName; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java index 49958f69..230849ff 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/dto/RefreshRequestDTO.java @@ -1,6 +1,9 @@ package it.integry.integrywmsnative.gest.login.dto; +import com.google.gson.annotations.SerializedName; + public class RefreshRequestDTO { + @SerializedName("refreshToken") private String refreshToken; public String getRefreshToken() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java index 0da2e662..16c8e573 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java @@ -806,7 +806,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF @Override public void onResume() { super.onResume(); - Stream.of(this.mOrdiniInevasiMutableData) + this.mOrdiniInevasiMutableData.stream() .forEach(x -> x.getSelectedObservable().set(false)); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java index da57df96..927b8db1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java @@ -252,7 +252,13 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra @Override public void onItemDeleteRequest(VerificaGiacenzeRowEntity data) { - mViewModel.deleteRow(data); + executorService.execute(() -> { + try { + mViewModel.deleteRow(data); + } catch (Exception ex) { + onError(ex); + } + }); } @@ -317,12 +323,12 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra return result.get(); } - public void saveAndClose() { + public void Close() { this.onLoadingStarted(); executorService.execute(() -> { try { - mViewModel.save(); + mViewModel.close(); this.onLoadingEnded(); popMe(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeModule.java index 72d23a34..169f646a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeModule.java @@ -8,7 +8,7 @@ import dagger.Module; import dagger.Provides; import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRepository; import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRowRepository; -import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper; +import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeRowMapper; import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer; @@ -16,8 +16,8 @@ import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer; public class VerificaGiacenzeModule { @Provides - VerificaGiacenzeViewModel providesVerificaGiacenzeViewModel(ExecutorService executorService, Handler handler, VerificaGiacenzeMapper verificaGiacenzeMapper, VerificaGiacenzeRepository verificaGiacenzeRepository, VerificaGiacenzeRowRepository verificaGiacenzeRowRepository, GiacenzaPvRESTConsumer giacenzaPvRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) { - return new VerificaGiacenzeViewModel(executorService, handler, verificaGiacenzeMapper, giacenzaPvRESTConsumer, verificaGiacenzeRepository, verificaGiacenzeRowRepository, articoloRESTConsumer); + VerificaGiacenzeViewModel providesVerificaGiacenzeViewModel(ExecutorService executorService, Handler handler, VerificaGiacenzeRowMapper verificaGiacenzeRowMapper, VerificaGiacenzeRepository verificaGiacenzeRepository, VerificaGiacenzeRowRepository verificaGiacenzeRowRepository, GiacenzaPvRESTConsumer giacenzaPvRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) { + return new VerificaGiacenzeViewModel(executorService, handler, verificaGiacenzeRowMapper, giacenzaPvRESTConsumer, verificaGiacenzeRepository, verificaGiacenzeRowRepository, articoloRESTConsumer); } } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java index 690502bd..33f11e77 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java @@ -11,7 +11,6 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; @@ -23,14 +22,18 @@ import it.integry.integrywmsnative.core.data_store.db.entity.VerificaGiacenzeRow import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRepository; import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGiacenzeRowRepository; import it.integry.integrywmsnative.core.exception.NoArtsFoundException; +import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener; import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper; +import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeRowMapper; import it.integry.integrywmsnative.core.model.MtbAart; -import it.integry.integrywmsnative.core.model.MtbAartBarCode; import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer; import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel; +import it.integry.integrywmsnative.core.rest.model.pv.CloseVerificaRequestDTO; +import it.integry.integrywmsnative.core.rest.model.pv.DeleteRowVerificaRequestDTO; import it.integry.integrywmsnative.core.rest.model.pv.GiacenzaPvDTO; -import it.integry.integrywmsnative.core.rest.model.pv.SaveNewVerificaRequestDTO; +import it.integry.integrywmsnative.core.rest.model.pv.SaveNewRowVerificaRequestDTO; +import it.integry.integrywmsnative.core.rest.model.pv.UpdateRowVerificaRequestDTO; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; @@ -39,7 +42,7 @@ public class VerificaGiacenzeViewModel { private final ExecutorService executorService; private final Handler handler; - private final VerificaGiacenzeMapper verificaGiacenzeMapper; + private final VerificaGiacenzeRowMapper verificaGiacenzeRowMapper; private final GiacenzaPvRESTConsumer giacenzaPvRESTConsumer; private final VerificaGiacenzeRepository verificaGiacenzeRepository; private final VerificaGiacenzeRowRepository verificaGiacenzeRowRepository; @@ -56,14 +59,14 @@ public class VerificaGiacenzeViewModel { @Inject public VerificaGiacenzeViewModel(ExecutorService executorService, Handler handler, - VerificaGiacenzeMapper verificaGiacenzeMapper, + VerificaGiacenzeRowMapper verificaGiacenzeRowMapper, GiacenzaPvRESTConsumer giacenzaPvRESTConsumer, VerificaGiacenzeRepository verificaGiacenzeRepository, VerificaGiacenzeRowRepository verificaGiacenzeRowRepository, ArticoloRESTConsumer articoloRESTConsumer) { this.executorService = executorService; this.handler = handler; - this.verificaGiacenzeMapper = verificaGiacenzeMapper; + this.verificaGiacenzeRowMapper = verificaGiacenzeRowMapper; this.giacenzaPvRESTConsumer = giacenzaPvRESTConsumer; this.verificaGiacenzeRepository = verificaGiacenzeRepository; this.verificaGiacenzeRowRepository = verificaGiacenzeRowRepository; @@ -168,19 +171,17 @@ public class VerificaGiacenzeViewModel { return entity; } - - public void save() throws Exception { + public void close() throws Exception { if (currentVerificaRows.getValue().isEmpty()) { delete(); return; } - currentVerifica.getValue().setVerificaGiacenzeRowList(currentVerificaRows.getValue()); + CloseVerificaRequestDTO request = new CloseVerificaRequestDTO() + .setCodMdep(Objects.requireNonNull(currentVerifica.getValue()).getCodMdep()) + .setDataVerifica(Objects.requireNonNull(currentVerifica.getValue()).getData()); - SaveNewVerificaRequestDTO saveRequest = new SaveNewVerificaRequestDTO() - .setData(verificaGiacenzeMapper.mapRoomToRest(currentVerifica.getValue())); - - giacenzaPvRESTConsumer.saveNewVerificaSynchronized(saveRequest); + giacenzaPvRESTConsumer.closeVerifica(request); delete(); } @@ -300,6 +301,19 @@ public class VerificaGiacenzeViewModel { } public void insertRow(VerificaGiacenzeRowEntity rowEntity) { + this.sendOnLoadingStarted(); + + var saveRequest = new SaveNewRowVerificaRequestDTO() + .setCodMdep(Objects.requireNonNull(currentVerifica.getValue()).getCodMdep()) + .setDataVerifica(Objects.requireNonNull(currentVerifica.getValue()).getData()) + .setRow(verificaGiacenzeRowMapper.mapRoomToRest(rowEntity)); + + try { + giacenzaPvRESTConsumer.saveNewRowSynchronized(saveRequest); + } catch (Exception e) { + this.sendError(e); + } + verificaGiacenzeRowRepository.insert(rowEntity, insertedData -> { handler.post(() -> { currentVerificaRows.getValue().add(insertedData); @@ -309,6 +323,19 @@ public class VerificaGiacenzeViewModel { } public void updateRow(VerificaGiacenzeRowEntity rowEntity) { + this.sendOnLoadingStarted(); + + var updateRequest = new UpdateRowVerificaRequestDTO() + .setCodMdep(Objects.requireNonNull(currentVerifica.getValue()).getCodMdep()) + .setDataVerifica(Objects.requireNonNull(currentVerifica.getValue()).getData()) + .setRow(verificaGiacenzeRowMapper.mapRoomToRest(rowEntity)); + + try { + giacenzaPvRESTConsumer.updateRowSynchronized(updateRequest); + } catch (Exception e) { + this.sendError(e); + } + var indexInList = -1; List value = currentVerificaRows.getValue(); @@ -331,6 +358,19 @@ public class VerificaGiacenzeViewModel { } public void deleteRow(VerificaGiacenzeRowEntity rowEntity) { + this.sendOnLoadingStarted(); + + var deleteRequest = new DeleteRowVerificaRequestDTO() + .setCodMdep(Objects.requireNonNull(currentVerifica.getValue()).getCodMdep()) + .setDataVerifica(Objects.requireNonNull(currentVerifica.getValue()).getData()) + .setRow(verificaGiacenzeRowMapper.mapRoomToRest(rowEntity)); + + try { + giacenzaPvRESTConsumer.deleteRowSynchronized(deleteRequest); + } catch (Exception e) { + this.sendError(e); + } + verificaGiacenzeRowRepository.delete(rowEntity, () -> { handler.post(() -> { @@ -343,6 +383,7 @@ public class VerificaGiacenzeViewModel { private void notifyRowChanged() { currentVerificaRows.postValue(currentVerificaRows.getValue()); + this.sendOnLoadingEnded(); } private PickedQuantityDTO sendOnItemDispatched(MtbAart mtbAart, @@ -373,7 +414,15 @@ public class VerificaGiacenzeViewModel { this.listener.onError(ex); } - public interface Listener { + private void sendOnLoadingStarted() { + if (this.listener != null) listener.onLoadingStarted(); + } + + private void sendOnLoadingEnded() { + if (this.listener != null) listener.onLoadingEnded(); + } + + public interface Listener extends ILoadingListener { PickedQuantityDTO onItemDispatched(MtbAart mtbAart, BigDecimal initialNumCnf, BigDecimal initialQtaCnf, diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java index 09cb77c2..56fa0e2e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java @@ -19,6 +19,8 @@ import androidx.sqlite.db.SimpleSQLiteQuery; import com.annimon.stream.Stream; import com.google.android.material.snackbar.Snackbar; +import com.google.firebase.crashlytics.CustomKeysAndValues; +import com.google.firebase.crashlytics.FirebaseCrashlytics; import com.harrysoft.androidbluetoothserial.BluetoothManager; import java.io.BufferedReader; @@ -318,6 +320,9 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT this.closeProgress(); } catch (Exception ex) { handler.post(() -> { + FirebaseCrashlytics.getInstance().recordException(ex, new CustomKeysAndValues.Builder() {{ + putString("ExportLog", "Error while exporting log"); + }}.build()); this.closeProgress(); UtilityExceptions.defaultException(requireContext(), ex); }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index 26934866..58c691a9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -854,12 +854,10 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo public void closeOrder() { this.fabPopupMenu.dismiss(); - this.onLoadingStarted(); executorService.execute(() -> { try { this.mViewmodel.closeOrder(); - this.onLoadingEnded(); } catch (Exception e) { onError(e); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index 6c7646fc..754f7793 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -341,14 +341,6 @@ public class SpedizioneViewModel { return mIsOrdTrasf; } - private void onOrderClosedPrintingDone() { - if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) { - this.sendCreateDocsRequest(); - } else { - this.sendOnOrderClosed(); - } - - } private void sendOnLoadingStarted() { if (this.mListener != null) mListener.onLoadingStarted(); @@ -2123,15 +2115,21 @@ public class SpedizioneViewModel { } public void closeOrder() { + this.sendOnLoadingStarted(); + if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) { var printRequestResult = this.sendOnCloseOrderPrintRequest(); - this.onCloseOrderPrintRequest(printRequestResult); + this.onCloseOrderPrintRequested(printRequestResult); } - this.onOrderClosedPrintingDone(); + if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) { + this.sendCreateDocsRequest(); + } + + this.sendOnOrderClosed(); } - private void onCloseOrderPrintRequest(PrintOrderCloseDTO dto) { + private void onCloseOrderPrintRequested(PrintOrderCloseDTO dto) { if (!dto.isFlagPrintPackingList() && !dto.isFlagPrintSSCC()) { return; } @@ -2147,13 +2145,22 @@ public class SpedizioneViewModel { dto.setPrintList(closedOrders); + CountDownLatch latch = new CountDownLatch(1); + try { printClosedOrders(dto); + latch.countDown(); } catch (Exception e) { this.sendLUPrintError(e, () -> { + latch.countDown(); }); } + try { + latch.await(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } } private void printClosedOrders(PrintOrderCloseDTO dto) throws Exception { @@ -2196,6 +2203,7 @@ public class SpedizioneViewModel { void createDocs() { executorService.execute(() -> { + this.sendOnLoadingStarted(); List registeredUds = null; try { @@ -2232,7 +2240,12 @@ public class SpedizioneViewModel { loadCollidto.setSaveDoc(true); loadCollidto.setGestione("L"); - this.mDocumentRESTConsumer.createDocFromColli(loadCollidto, doc -> this.sendOnOrderClosed(), this::sendError); + try { + this.mDocumentRESTConsumer.makeSynchronousCreateDocFromColliRequest(loadCollidto); + } catch (Exception e) { + sendError(e); + } + this.sendOnLoadingEnded(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java index aca61953..f0dd7b88 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/tracciamento_imballi/TracciamentoImballoDTO.java @@ -2,14 +2,23 @@ package it.integry.integrywmsnative.view.dialogs.tracciamento_imballi; import androidx.databinding.ObservableBoolean; import androidx.databinding.ObservableField; +import com.google.gson.annotations.SerializedName; public class TracciamentoImballoDTO { + @SerializedName("codTcol") private final ObservableField codTcol = new ObservableField<>(); + + @SerializedName("descrizione") private final ObservableField descrizione = new ObservableField<>(); + + @SerializedName("codMart") private final ObservableField codMart = new ObservableField<>(); + + @SerializedName("qta") private final ObservableField qta = new ObservableField<>(); + @SerializedName("editable") private final ObservableBoolean editable = new ObservableBoolean(true); public ObservableField getCodTcol() { diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index bc792173..aa3cd581 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -6,6 +6,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_verifica_giacenze.xml b/app/src/main/res/layout/fragment_verifica_giacenze.xml index fb29e68b..5024a6c3 100644 --- a/app/src/main/res/layout/fragment_verifica_giacenze.xml +++ b/app/src/main/res/layout/fragment_verifica_giacenze.xml @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="16dp" - app:singleClick="@{() -> view.saveAndClose()}" + app:singleClick="@{() -> view.Close()}" app:srcCompat="@drawable/ic_round_check_24" app:visibilityWhenNotNull="@{viewModel.currentVerifica}" /> diff --git a/build.gradle b/build.gradle index a3271aa6..e7045486 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '2.1.0' - agp_version = '8.10.0' + agp_version = '8.11.1' } repositories { diff --git a/gradle.properties b/gradle.properties index d0ea058a..81ee4cc6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,18 +14,11 @@ android.useAndroidX=true android.enableJetifier=true -# android.enableSeparateAnnotationProcessing = true - - -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true # Enable Gradle Daemon -org.gradle.daemon=true +org.gradle.daemon=false # Enable Configure on demand org.gradle.configureondemand=true # Enable parallel builds @@ -33,5 +26,5 @@ org.gradle.parallel=true # Enable simple gradle caching org.gradle.caching=true # Increase memory allotted to JVM -org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC -org.gradle.unsafe.configuration-cache=true \ No newline at end of file +org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC -XX:MaxMetaspaceSize=512m +org.gradle.unsafe.configuration-cache=ON \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372aef..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e964c0c8..37f853b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Feb 13 15:14:43 CET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 9d82f789..f5feea6d 100644 --- a/gradlew +++ b/gradlew @@ -1,74 +1,130 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -77,84 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282a..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -8,26 +26,30 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,54 +57,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal