Merge pull request #85 from iExecBlockchainComputing/feature/[email protected]@1.0.2

Feature/iexec [email protected] iexec commons [email protected]

Author: jbern0rd

CHANGELOG.md

@@ -5,12 +5,14 @@ All notable changes to this project will be documented in this file.
 ## [[NEXT]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/vNEXT) 2023
 
 ### New Features
-* Enable Prometheus actuator. (#84)
+- Enable Prometheus actuator. (#84)
 ### Bug Fixes
-* Fix link in changelog. (#83)
+- Fix link in changelog. (#83)
 ### Quality
 ### Dependency Upgrades
-* Upgrade to `expiringmap` 0.5.10. (#84)
+- Upgrade to `expiringmap` 0.5.10. (#84)
+- Upgrade to `iexec-common` 8.0.0. (#85)
+- Upgrade to `iexec-commons-poco` 1.0.2. (#85)
 
 ## [[8.0.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.0.0) 2023-03-03
 

build.gradle

@@ -48,7 +48,8 @@ allprojects {
 
 dependencies {
     // iexec
-    implementation "com.iexec.common:iexec-common:${iexecCommonVersion}"
+    implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
+    implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
 
     // Web3j issues, see core build.gradle
     // NoSuchMethodError: 'okhttp3.RequestBody okhttp3.RequestBody.create(java.lang.String, okhttp3.MediaType)'

gradle.properties

@@ -1,5 +1,6 @@
 version=8.0.0
-iexecCommonVersion=7.0.0
+iexecCommonVersion=8.0.0
+iexecCommonsPocoVersion=1.0.2
 
 nexusUser
 nexusPassword

src/main/java/com/iexec/resultproxy/chain/IexecHubService.java

@@ -1,6 +1,22 @@
+/*
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.iexec.resultproxy.chain;
 
-import com.iexec.common.chain.IexecHubAbstractService;
+import com.iexec.commons.poco.chain.IexecHubAbstractService;
 
 import org.springframework.stereotype.Service;
 

src/main/java/com/iexec/resultproxy/chain/Web3jService.java

@@ -1,6 +1,22 @@
+/*
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.iexec.resultproxy.chain;
 
-import com.iexec.common.chain.Web3jAbstractService;
+import com.iexec.commons.poco.chain.Web3jAbstractService;
 
 import org.springframework.stereotype.Service;
 

src/main/java/com/iexec/resultproxy/challenge/ChallengeService.java

@@ -1,19 +1,32 @@
+/*
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.iexec.resultproxy.challenge;
 
 import com.iexec.common.chain.eip712.entity.EIP712Challenge;
 import com.iexec.common.security.SignedChallenge;
-import com.iexec.common.utils.BytesUtils;
-import com.iexec.common.utils.SignatureUtils;
-
+import com.iexec.commons.poco.utils.BytesUtils;
+import com.iexec.commons.poco.utils.SignatureUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.web3j.utils.Numeric;
 
-import lombok.extern.slf4j.Slf4j;
-
-
-@Service
 @Slf4j
+@Service
 public class ChallengeService {
 
     private final EIP712ChallengeService eip712ChallengeService;

src/main/java/com/iexec/resultproxy/proxy/ProxyService.java

@@ -1,10 +1,26 @@
+/*
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ *
+ * 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
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.iexec.resultproxy.proxy;
 
 
-import com.iexec.common.chain.ChainContributionStatus;
-import com.iexec.common.chain.ChainTask;
-import com.iexec.common.chain.ChainTaskStatus;
-import com.iexec.common.task.TaskDescription;
+import com.iexec.commons.poco.chain.ChainContributionStatus;
+import com.iexec.commons.poco.chain.ChainTask;
+import com.iexec.commons.poco.chain.ChainTaskStatus;
+import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.resultproxy.chain.IexecHubService;
 import com.iexec.resultproxy.ipfs.IpfsResultService;
 import com.iexec.resultproxy.result.Result;